diff options
author | Chris Craik <ccraik@google.com> | 2012-05-16 10:22:32 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-16 10:22:32 -0700 |
commit | ff7c397b7e18be2ae819c4ffba438b738593ca20 (patch) | |
tree | d7df9df8e9bd076dea8c1cf39bcd6b8dab15943f /Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | |
parent | 0b072353e2ad89087c944dfb4acb1eff87bbac49 (diff) | |
download | external_webkit-ff7c397b7e18be2ae819c4ffba438b738593ca20.zip external_webkit-ff7c397b7e18be2ae819c4ffba438b738593ca20.tar.gz external_webkit-ff7c397b7e18be2ae819c4ffba438b738593ca20.tar.bz2 |
Revert "Allow more layers to be merged."
This was causing content to go missing.
bug:6504906
This reverts commit 0b072353e2ad89087c944dfb4acb1eff87bbac49
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index 3975545..a6bf6af 100644 --- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -531,8 +531,8 @@ void GraphicsLayerAndroid::updateScrollingLayers() if (layerNeedsOverflow) { ASSERT(!m_foregroundLayer && !m_foregroundClipLayer); m_foregroundLayer = new ScrollableLayerAndroid(layer); - m_foregroundLayer->setIntrinsicallyComposited(true); + // TODO: can clip layer be set to not intrinsically composited? m_foregroundClipLayer = new LayerAndroid(layer); m_foregroundClipLayer->setMasksToBounds(true); m_foregroundClipLayer->addChild(m_foregroundLayer); |