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 /WebKit/android/jni | |
| 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 'WebKit/android/jni')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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)", |