diff options
| author | Patrick Scott <phanna@android.com> | 2010-12-13 10:28:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-13 10:28:01 -0800 |
| commit | b41d06babb774af11ede0ea864bb38c6cfe66707 (patch) | |
| tree | 74e7a072b17faa510bf17f0d5127be1434e3c659 /WebCore/platform | |
| parent | 97b3a15064089a16c787d230d6dcd24c8231e3bc (diff) | |
| parent | 27dd9e051d0960e985cb677bfc1ce20531ac0456 (diff) | |
| download | external_webkit-b41d06babb774af11ede0ea864bb38c6cfe66707.zip external_webkit-b41d06babb774af11ede0ea864bb38c6cfe66707.tar.gz external_webkit-b41d06babb774af11ede0ea864bb38c6cfe66707.tar.bz2 | |
Merge "Enable iframe scrolling."
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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); |