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 /WebKit | |
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 'WebKit')
-rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 | ||||
-rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index cbed244..37c7445 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1218,7 +1218,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->parentNode(); 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 52ee72c..48583be 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -1169,7 +1169,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->parentNode()->isContentEditable()) { bounds = absBounds; takesFocus = true; type = CONTENT_EDITABLE_CACHEDNODETYPE; |