diff options
| author | Bart Sears <bsears@google.com> | 2011-11-17 19:25:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 19:25:21 -0800 |
| commit | e2e7333b68070e867d6d96f46bedd49eb85199a0 (patch) | |
| tree | d46a41883a736bacca894098452087bac0de282c /Source/WebCore/rendering/RenderLayerCompositor.cpp | |
| parent | 4b6100afbe2ee836e22f8fa8d55d7434309fe563 (diff) | |
| parent | 139c51ff62a002e015fde2d06e2102633d9a8023 (diff) | |
| download | external_webkit-e2e7333b68070e867d6d96f46bedd49eb85199a0.zip external_webkit-e2e7333b68070e867d6d96f46bedd49eb85199a0.tar.gz external_webkit-e2e7333b68070e867d6d96f46bedd49eb85199a0.tar.bz2 | |
Merge "Only allow stacking contexts to skip compositing" into ics-mr1
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerCompositor.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index 598926d..fdf8270 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -650,7 +650,7 @@ bool RenderLayerCompositor::checkForFixedLayers(Vector<RenderLayer*>* list, bool IntRect bounds = aLayer->renderer()->localToAbsoluteQuad( FloatRect(aLayer->localBoundingBox())).enclosingBoundingBox(); if (bounds.contains(currentLayerBounds) - && needsToBeComposited(aLayer)) { + && needsToBeComposited(aLayer) && aLayer->isStackingContext()) { needComposite = false; break; } |