diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-08 18:03:15 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87 (patch) | |
| tree | 62766bb365cdeae13e25ab69d3a36427fc14af39 /WebCore/rendering | |
| parent | 4576aa36e9a9671459299c7963ac95aa94beaea9 (diff) | |
| download | external_webkit-23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87.zip external_webkit-23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87.tar.gz external_webkit-23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87.tar.bz2 | |
Merge WebKit at r73109: use parentNode method.
This is because of:
http://trac.webkit.org/changeset/72825/trunk/WebCore/dom/Node.h
which makes the parent method private.
Change-Id: I706c4cbc4e69bee990f9e138aeb7ad2ed2a3d42f
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 878d1ab..3c1ab60 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->parent()->hasTagName(HTMLNames::aTag) && - !node->parent()->hasTagName(HTMLNames::liTag)))) + (!node->parentNode()->hasTagName(HTMLNames::aTag) && + !node->parentNode()->hasTagName(HTMLNames::liTag)))) hasTextToWrap = true; } } |