summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-10-21 15:28:20 -0700
committerBart Sears <bsears@google.com>2011-11-03 20:26:39 -0700
commitc0ecbafeca623e3cfe59454194c265adfc4db1e6 (patch)
tree656e99dab67fc69a09032e5134d82ff30273a9bc
parent0d4258e78caa860491a4c9e6965e574dabc3ec63 (diff)
downloadwebkit-c0ecbafeca623e3cfe59454194c265adfc4db1e6.tar.gz
Don't force composited layers to be stacking contexts - DO NOT MERGE
Cherry-pick of c0fb399b4644c319c15e0a6a7e0f6c29917d9099 bug:5264240 Was causing crashes, and layer ordering problems. Change-Id: Ieecff6d64405f13b459ea013da2a309b00077d47
-rw-r--r--Source/WebCore/rendering/RenderLayer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h
index f2575938e..02ab8e99b 100644
--- a/Source/WebCore/rendering/RenderLayer.h
+++ b/Source/WebCore/rendering/RenderLayer.h
@@ -354,7 +354,7 @@ public:
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)