diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-18 16:10:06 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2011-01-18 16:10:06 -0500 |
| commit | c4ae5f0659c148fe7bb241fbf4f11ed39eb5dbd7 (patch) | |
| tree | e62ca9a34106e74d0f35da0fcefdcfada22fb28c /WebCore/rendering | |
| parent | f42f297f9d1e499b6b54e6c73ddb46dbb4745ede (diff) | |
| download | external_webkit-c4ae5f0659c148fe7bb241fbf4f11ed39eb5dbd7.zip external_webkit-c4ae5f0659c148fe7bb241fbf4f11ed39eb5dbd7.tar.gz external_webkit-c4ae5f0659c148fe7bb241fbf4f11ed39eb5dbd7.tar.bz2 | |
Set the local flag when compositing a fixed element.
This fixes an assert and ensures that the compositor is in the correct state.
Change-Id: I7556ed998821bf2e09d89b79935e876869a584c6
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderLayerCompositor.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp index 654f6e6..0877468 100644 --- a/WebCore/rendering/RenderLayerCompositor.cpp +++ b/WebCore/rendering/RenderLayerCompositor.cpp @@ -591,13 +591,12 @@ void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* layer, O if (layer->isFixed()) compositingState.m_fixedSibling = true; - if (!willBeComposited && compositingState.m_fixedSibling) + if (!willBeComposited && compositingState.m_fixedSibling) { layer->setMustOverlapCompositedLayers(true); - - if (willBeComposited || compositingState.m_fixedSibling) { -#else - if (willBeComposited) { + willBeComposited = true; + } #endif + if (willBeComposited) { // Tell the parent it has compositing descendants. compositingState.m_subtreeIsCompositing = true; // This layer now acts as the ancestor for kids. |