From 1dd1344ade226cec7f9f85e84744fffdd222d232 Mon Sep 17 00:00:00 2001 From: Patrick Scott Date: Wed, 15 Dec 2010 08:21:15 -0500 Subject: Re-enable iframe scrolling. This reverts commit c7911ffd666a7e73131dfd68919b769086a093e0. --- WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp') 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