diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:37:24 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:20:54 +0000 |
| commit | e509b5dfedf2a9cb61dacd53b55bed4ba34f0974 (patch) | |
| tree | dac4aff5adf77cbe237784dcd50fb0d09a400daf /WebCore/rendering/RenderBlockLineLayout.cpp | |
| parent | 8ebdc3cd1d7fdf78826e8369b1bb7c20798a7d9e (diff) | |
| download | external_webkit-e509b5dfedf2a9cb61dacd53b55bed4ba34f0974.zip external_webkit-e509b5dfedf2a9cb61dacd53b55bed4ba34f0974.tar.gz external_webkit-e509b5dfedf2a9cb61dacd53b55bed4ba34f0974.tar.bz2 | |
Merge WebKit at r72805: Use Node::parent() rather than Node::parentNode()
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
Diffstat (limited to 'WebCore/rendering/RenderBlockLineLayout.cpp')
| -rw-r--r-- | WebCore/rendering/RenderBlockLineLayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp index 3c1ab60..878d1ab 100644 --- a/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/WebCore/rendering/RenderBlockLineLayout.cpp @@ -655,8 +655,8 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica // 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; } } |