diff options
| author | Patrick Scott <phanna@android.com> | 2010-12-15 08:21:15 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-12-15 08:21:15 -0500 |
| commit | 1dd1344ade226cec7f9f85e84744fffdd222d232 (patch) | |
| tree | e99ff47e802fe90ba5c617dce34221807598d760 /WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | |
| parent | 052fc207e3b0c145df08f85c14a7946b5ae3b79f (diff) | |
| download | external_webkit-1dd1344ade226cec7f9f85e84744fffdd222d232.zip external_webkit-1dd1344ade226cec7f9f85e84744fffdd222d232.tar.gz external_webkit-1dd1344ade226cec7f9f85e84744fffdd222d232.tar.bz2 | |
Re-enable iframe scrolling.
This reverts commit c7911ffd666a7e73131dfd68919b769086a093e0.
Diffstat (limited to 'WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp')
| -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); |