diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-16 12:49:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-16 12:49:23 -0700 |
| commit | 7b17ee7dc951f404d93a458a61884d5c1bf6e40f (patch) | |
| tree | f61be31953c06686fd29b5a78e67e3d0d8a6db11 | |
| parent | f0acbad2f51b0bd62dbc427b4f2fdc97e233edb9 (diff) | |
| parent | 58502d2a5168cfd7fdadc023e11094032218d69a (diff) | |
| download | external_webkit-7b17ee7dc951f404d93a458a61884d5c1bf6e40f.zip external_webkit-7b17ee7dc951f404d93a458a61884d5c1bf6e40f.tar.gz external_webkit-7b17ee7dc951f404d93a458a61884d5c1bf6e40f.tar.bz2 | |
Merge "Revert "Fix crash in RenderLayerCompositor::updateCompositingLayers"" into jb-dev
| -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()) |