diff options
| author | Patrick Scott <phanna@android.com> | 2010-12-13 11:20:07 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-12-13 12:52:59 -0500 |
| commit | 27dd9e051d0960e985cb677bfc1ce20531ac0456 (patch) | |
| tree | ae3906b16661429d4e19396cde0349dfca01e13f /WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | |
| parent | c5a7eaffa9be6afd209020f1ffdc6278c284e7a3 (diff) | |
| download | external_webkit-27dd9e051d0960e985cb677bfc1ce20531ac0456.zip external_webkit-27dd9e051d0960e985cb677bfc1ce20531ac0456.tar.gz external_webkit-27dd9e051d0960e985cb677bfc1ce20531ac0456.tar.bz2 | |
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
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); |