This is a revert of
"Merge WebKit at r73109: use parentNode method."
See http://trac.webkit.org/changeset/72825
This reverts commit
23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87.
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5ba4d0976c3b87b32326fdc8e2eb1cffdd7541cf
// be a tab. Pick 25 for now as it covers around 160px
// (half of 320px) with the default font.
if (length > 25 || (length > 3 &&
- (!node->parentNode()->hasTagName(HTMLNames::aTag) &&
- !node->parentNode()->hasTagName(HTMLNames::liTag))))
+ (!node->parent()->hasTagName(HTMLNames::aTag) &&
+ !node->parent()->hasTagName(HTMLNames::liTag))))
hasTextToWrap = true;
}
}
// in the html. If it is the HitTestResult, it may have zero
// width and height. In this case, use its parent node.
if (bounds.width() == 0) {
- node = node->parentNode();
+ node = node->parent();
if (node) {
bounds = node->getRect();
DBG_NAV_LOGD("found a zero width node and use its parent, whose ob:(x=%d,y=%d,w=%d,h=%d)",
goto keepNode;
}
// Only use the root contentEditable element
- if (node->isContentEditable() && !node->parentNode()->isContentEditable()) {
+ if (node->isContentEditable() && !node->parent()->isContentEditable()) {
bounds = absBounds;
takesFocus = true;
type = CONTENT_EDITABLE_CACHEDNODETYPE;