From 27dd9e051d0960e985cb677bfc1ce20531ac0456 Mon Sep 17 00:00:00 2001 From: Patrick Scott Date: Mon, 13 Dec 2010 11:20:07 -0500 Subject: Enable iframe scrolling. Turn off iframe expansion and record iframes in a composited layer. Fix navigation by tracking iframe layers if needed. Remove the logic to add focused nodes to the last tracked layer as it is not needed and might add nodes to the wrong layer. Bug: 3219076, 3211666, 3201077, 3194321 Change-Id: Ifc0b83102438255db7e4b62ad260f50ebbdb0e50 --- WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'WebCore/platform') diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index 0fdbc21..c0ad248 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -367,8 +367,7 @@ void GraphicsLayerAndroid::setDrawsContent(bool drawsContent) m_foregroundClipLayer->addChild(m_foregroundLayer); m_contentLayer->addChild(m_foregroundClipLayer); - } else if (false /* FIXME: disable until navigation is fixed */ && - layer->isRootLayer() && + } else if (layer->isRootLayer() && layer->renderer()->frame()->ownerRenderer()) { // Replace the content layer with a scrollable layer. LayerAndroid* layer = new ScrollableLayerAndroid(*m_contentLayer); -- cgit v1.1