diff options
| author | Guang Zhu <guangzhu@google.com> | 2010-12-14 13:51:33 -0800 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2010-12-14 14:10:00 -0800 |
| commit | c7911ffd666a7e73131dfd68919b769086a093e0 (patch) | |
| tree | 2c262a61daf36aa5b3c5412fbcdb443462a68534 /WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | |
| parent | 0d7cec732e3f00f89749d4946fd22168d8d4111c (diff) | |
| download | external_webkit-c7911ffd666a7e73131dfd68919b769086a093e0.zip external_webkit-c7911ffd666a7e73131dfd68919b769086a093e0.tar.gz external_webkit-c7911ffd666a7e73131dfd68919b769086a093e0.tar.bz2 | |
Revert "Enable iframe scrolling."
This reverts commit 27dd9e051d0960e985cb677bfc1ce20531ac0456.
Diffstat (limited to 'WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index c0ad248..0fdbc21 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -367,7 +367,8 @@ void GraphicsLayerAndroid::setDrawsContent(bool drawsContent) m_foregroundClipLayer->addChild(m_foregroundLayer); m_contentLayer->addChild(m_foregroundClipLayer); - } else if (layer->isRootLayer() && + } else if (false /* FIXME: disable until navigation is fixed */ && + layer->isRootLayer() && layer->renderer()->frame()->ownerRenderer()) { // Replace the content layer with a scrollable layer. LayerAndroid* layer = new ScrollableLayerAndroid(*m_contentLayer); |