summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/rendering
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-05-16 10:22:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-16 10:22:32 -0700
commitff7c397b7e18be2ae819c4ffba438b738593ca20 (patch)
treed7df9df8e9bd076dea8c1cf39bcd6b8dab15943f /Source/WebCore/platform/graphics/android/rendering
parent0b072353e2ad89087c944dfb4acb1eff87bbac49 (diff)
downloadexternal_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/rendering')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/Surface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/Surface.h b/Source/WebCore/platform/graphics/android/rendering/Surface.h
index 7100125..a79a286 100644
--- a/Source/WebCore/platform/graphics/android/rendering/Surface.h
+++ b/Source/WebCore/platform/graphics/android/rendering/Surface.h
@@ -93,7 +93,7 @@ public:
LayerMergeState(Vector<Surface*>* const allGroups)
: surfaceList(allGroups)
, currentSurface(0)
- , nonMergeNestedLevel(0)
+ , nonMergeNestedLevel(-1) // start at -1 to ignore first LayerAndroid's clipping
, depth(0)
{}