diff options
| author | Steve Block <steveblock@google.com> | 2011-06-03 14:16:27 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 15:24:36 +0100 |
| commit | 24bd542d53743a6d367519174823cc57ad9cd3f8 (patch) | |
| tree | 9880639050e77d91dca5a615edbe655483a7abf5 /Source | |
| parent | afec8e01b31500328646269eadfaff1913adceba (diff) | |
| download | external_webkit-24bd542d53743a6d367519174823cc57ad9cd3f8.zip external_webkit-24bd542d53743a6d367519174823cc57ad9cd3f8.tar.gz external_webkit-24bd542d53743a6d367519174823cc57ad9cd3f8.tar.bz2 | |
Merge WebKit at r82507: Node::isContentEditable() renamed
See http://trac.webkit.org/changeset/81965
Change-Id: I9a4e628938c8cd1238140eb7e5617700487ca227
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/android/nav/CacheBuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp index 019ac49..a31169b 100644 --- a/Source/WebKit/android/nav/CacheBuilder.cpp +++ b/Source/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->parentOrHostNode()->isContentEditable()) { + if (node->rendererIsEditable() && !node->parentOrHostNode()->rendererIsEditable()) { bounds = absBounds; takesFocus = true; type = CONTENT_EDITABLE_CACHEDNODETYPE; |