diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-06 12:13:23 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:33 +0100 |
| commit | bfce793ad58f0a43e19e55c8ce237cb43a977c42 (patch) | |
| tree | d65e65bd5dfc70e0094164c48471f2bbc46d36f9 /WebCore/rendering | |
| parent | 3d1d9efae9595781854acd0ed6af00dcf7f26221 (diff) | |
| download | external_webkit-bfce793ad58f0a43e19e55c8ce237cb43a977c42.zip external_webkit-bfce793ad58f0a43e19e55c8ce237cb43a977c42.tar.gz external_webkit-bfce793ad58f0a43e19e55c8ce237cb43a977c42.tar.bz2 | |
Merge WebKit at r74534: Fix RenderBlockLineLayout.cpp and others.
Fixes RenderBlockLineLayout.cpp, WebViewCore.cpp and CacheBuilder.cpp
after upstream refactoring.
See http://trac.webkit.org/changeset/73618
Change-Id: I7942d6d77ce70ceb147dd711c5229c649242b10c
Diffstat (limited to 'WebCore/rendering')
| -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 d8b11a8..1d909a3 100644 --- a/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/WebCore/rendering/RenderBlockLineLayout.cpp @@ -639,8 +639,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->parent()->hasTagName(HTMLNames::aTag) && - !node->parent()->hasTagName(HTMLNames::liTag)))) + (!node->parentOrHostNode()->hasTagName(HTMLNames::aTag) && + !node->parentOrHostNode()->hasTagName(HTMLNames::liTag)))) hasTextToWrap = true; } } |