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

3 files changed, 4 insertions, 4 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;
                     }
                 }
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 5bcfae3..ecb86ea 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1259,7 +1259,7 @@ void WebViewCore::setSizeScreenWidthAndScale(int width, int height,
                 // 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->parent();
+                    node = node->parentOrHostNode();
                     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)",
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index f45572a..8ac1c2a 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -1171,7 +1171,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
             goto keepNode;
         }
         // Only use the root contentEditable element
-        if (node->isContentEditable() && !node->parent()->isContentEditable()) {
+        if (node->isContentEditable() && !node->parentOrHostNode()->isContentEditable()) {
             bounds = absBounds;
             takesFocus = true;
             type = CONTENT_EDITABLE_CACHEDNODETYPE;