commit 55b5da341a376006b2e0ab9cc6dfba5a76c65c7c
author Bart Sears <bsears@google.com> Thu Nov 03 20:57:38 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 03 20:57:38 2011 -0700
tree d898e556ca0bb4c174731484ca0b1f1fe242358d
parent 209db4d462bfff0c9f13896f72611a82c2c6639c
parent c0ecbafeca623e3cfe59454194c265adfc4db1e6

Merge "Don't force composited layers to be stacking contexts - DO NOT MERGE" into ics-mr0

Source/WebCore/rendering/RenderLayer.h

diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h
index f257593..02ab8e9 100644
--- a/Source/WebCore/rendering/RenderLayer.h
+++ b/Source/WebCore/rendering/RenderLayer.h
@@ -354,7 +354,7 @@
       if (hasOverflowScroll())
           return true;
 #endif
-      return !hasAutoZIndex() || renderer()->isRenderView() || (isComposited() && isFixed()) || m_shouldComposite;
+      return !hasAutoZIndex() || renderer()->isRenderView() || (isComposited() && isFixed());
     }
 #else
 #if ENABLE(ANDROID_OVERFLOW_SCROLL)