diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-16 10:44:12 -0700 |
---|---|---|
committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-16 10:44:12 -0700 |
commit | 58502d2a5168cfd7fdadc023e11094032218d69a (patch) | |
tree | 8eeb92d38fc59637dc64feeb7bd4722e5ded557e /Source/WebCore/rendering | |
parent | eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0 (diff) | |
download | external_webkit-58502d2a5168cfd7fdadc023e11094032218d69a.zip external_webkit-58502d2a5168cfd7fdadc023e11094032218d69a.tar.gz external_webkit-58502d2a5168cfd7fdadc023e11094032218d69a.tar.bz2 |
Revert "Fix crash in RenderLayerCompositor::updateCompositingLayers"
bug:6505453
This reverts commit 87431609180dfb277a94cb8b81554e8bd2ef355d.
Diffstat (limited to 'Source/WebCore/rendering')
-rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index 7d70533..6b669e8 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -1425,13 +1425,8 @@ bool RenderLayerCompositor::requiresCompositingForAndroidLayers(const RenderLaye #if ENABLE(COMPOSITED_FIXED_ELEMENTS) // Enable composited layers (for fixed elements) - if (layer->isFixed()) { - // Skip fixed layers with a width or height of 1 or less... - IntRect bounds = layer->renderer()->localToAbsoluteQuad( - FloatRect(layer->localBoundingBox())).enclosingBoundingBox(); - if (bounds.width() > 1 && bounds.height() > 1) - return true; - } + if (layer->isFixed()) + return true; #endif if (layer->renderer()->isCanvas()) |