diff options
Diffstat (limited to 'Source/WebKit/android/nav/CacheBuilder.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/CacheBuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp index 019ac49..3ec15f3 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; @@ -2893,7 +2893,7 @@ bool CacheBuilder::setData(CachedFrame* cachedFrame) if ((x | y) != 0) viewBounds.setLocation(WebCore::IntPoint(x, y)); cachedFrame->setLocalViewBounds(viewBounds); - cachedFrame->setContentsSize(layer->width(), layer->height()); + cachedFrame->setContentsSize(layer->scrollWidth(), layer->scrollHeight()); if (cachedFrame->childCount() == 0) return true; CachedFrame* lastCachedFrame = cachedFrame->lastChild(); |