diff options
| author | Bart Sears <bsears@google.com> | 2011-11-18 14:47:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 14:47:52 -0800 |
| commit | e9a6f7f6329c1ca43f9d2b460dfae48945dbbdd1 (patch) | |
| tree | b7859da7a964bee26fa207100142986eb1c245c9 /Source/WebCore/rendering | |
| parent | 33cba7f38cb8b5c82107e07f658e1f5a0ace7ba8 (diff) | |
| parent | e2e7333b68070e867d6d96f46bedd49eb85199a0 (diff) | |
| download | external_webkit-e9a6f7f6329c1ca43f9d2b460dfae48945dbbdd1.zip external_webkit-e9a6f7f6329c1ca43f9d2b460dfae48945dbbdd1.tar.gz external_webkit-e9a6f7f6329c1ca43f9d2b460dfae48945dbbdd1.tar.bz2 | |
am e2e7333b: Merge "Only allow stacking contexts to skip compositing" into ics-mr1
* commit 'e2e7333b68070e867d6d96f46bedd49eb85199a0':
Only allow stacking contexts to skip compositing
Diffstat (limited to 'Source/WebCore/rendering')
| -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; } |