summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering/RenderLayer.h
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-10-24 11:27:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-24 11:27:18 -0700
commita58d317a8f6f9f1f6e1d8e72c28484f77bd950a7 (patch)
treea808cdfea17a3eaaaa438be4832d1152effe3061 /Source/WebCore/rendering/RenderLayer.h
parentf6bfe94d8f2312a226d88c9effc5a400df7a72c4 (diff)
parentb8c237486bcf299d8a04bdae8d8e35fd37866172 (diff)
downloadexternal_webkit-a58d317a8f6f9f1f6e1d8e72c28484f77bd950a7.zip
external_webkit-a58d317a8f6f9f1f6e1d8e72c28484f77bd950a7.tar.gz
external_webkit-a58d317a8f6f9f1f6e1d8e72c28484f77bd950a7.tar.bz2
Merge "Don't force composited layers to be stacking contexts"
Diffstat (limited to 'Source/WebCore/rendering/RenderLayer.h')
-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 f257593..02ab8e9 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)