diff options
| author | John Reck <jreck@google.com> | 2012-05-16 11:07:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-16 11:07:31 -0700 |
| commit | f0acbad2f51b0bd62dbc427b4f2fdc97e233edb9 (patch) | |
| tree | e61cdf672e06f3fda650698c3644f47eb6167d1a /Source/WebCore/platform/graphics/android/rendering | |
| parent | 9710142abfa1dd8dcedad50cc35b49c9e7c6cc57 (diff) | |
| parent | ff7c397b7e18be2ae819c4ffba438b738593ca20 (diff) | |
| download | external_webkit-f0acbad2f51b0bd62dbc427b4f2fdc97e233edb9.zip external_webkit-f0acbad2f51b0bd62dbc427b4f2fdc97e233edb9.tar.gz external_webkit-f0acbad2f51b0bd62dbc427b4f2fdc97e233edb9.tar.bz2 | |
Merge "Revert "Allow more layers to be merged."" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/Surface.h | 2 |
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) {} |