diff options
| author | Bart Sears <bsears@google.com> | 2011-11-03 20:57:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-03 20:57:38 -0700 |
| commit | 55b5da341a376006b2e0ab9cc6dfba5a76c65c7c (patch) | |
| tree | d898e556ca0bb4c174731484ca0b1f1fe242358d /Source/WebCore | |
| parent | 209db4d462bfff0c9f13896f72611a82c2c6639c (diff) | |
| parent | c0ecbafeca623e3cfe59454194c265adfc4db1e6 (diff) | |
| download | external_webkit-55b5da341a376006b2e0ab9cc6dfba5a76c65c7c.zip external_webkit-55b5da341a376006b2e0ab9cc6dfba5a76c65c7c.tar.gz external_webkit-55b5da341a376006b2e0ab9cc6dfba5a76c65c7c.tar.bz2 | |
Merge "Don't force composited layers to be stacking contexts - DO NOT MERGE" into ics-mr0
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayer.h | 2 |
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) |