Changeset 122376 in webkit

Timestamp:

Jul 11, 2012 3:26:55 PM (12 years ago)

Author:

Simon Fraser

Message:

Assertion ASSERTION FAILED: enclosingIntRect(rendererMappedResult) == enclosingIntRect(FloatQuad(result).boundingBox()) when compositing in paginated mode
​https://bugs.webkit.org/show_bug.cgi?id=90919

Reviewed by Antti Koivisto.

Source/WebCore:

r121124 added a fast path for geometry mapping that goes via layers
when possible. However, this broke paginated pages, which put
the root (RenderView) layer into column mode, because it failed
to check for columns on the ancestor layer.

Rather than make a risky change to convertToLayerCoords(), add a local
function canMapViaLayer(), which is like RenderLayer::canUseConvertToLayerCoords(),
but doesn't check for compositing (compositing itself is not a reason
to avoid convertToLayerCoords). Call canMapViaLayer() with the ancestorLayer
to check whether the ancestor has columns, which fixes the bug.

Test: compositing/columns/geometry-map-paginated-assert.html

• rendering/RenderGeometryMap.cpp:

(WebCore::canMapViaLayer):
(WebCore::RenderGeometryMap::pushMappingsToAncestor):

LayoutTests:

Test with a composited element in a document which is put into paginated mode.

• compositing/columns/geometry-map-paginated-assert-expected.txt: Added.
• compositing/columns/geometry-map-paginated-assert.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/columns (added)
• LayoutTests/compositing/columns/geometry-map-paginated-assert-expected.txt (added)
• LayoutTests/compositing/columns/geometry-map-paginated-assert.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGeometryMap.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Assertion ASSERTION FAILED: enclosingIntRect(rendererMappedResult) == enclosingIntRect(FloatQuad(result).boundingBox()) when compositing in paginated mode
+        https://bugs.webkit.org/show_bug.cgi?id=90919
+
+        Reviewed by Antti Koivisto.
+
+        Test with a composited element in a document which is put into paginated mode.
+
+        * compositing/columns/geometry-map-paginated-assert-expected.txt: Added.
+        * compositing/columns/geometry-map-paginated-assert.html: Added.
+
 2012-07-11  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Assertion ASSERTION FAILED: enclosingIntRect(rendererMappedResult) == enclosingIntRect(FloatQuad(result).boundingBox()) when compositing in paginated mode
+        https://bugs.webkit.org/show_bug.cgi?id=90919
+
+        Reviewed by Antti Koivisto.
+
+        r121124 added a fast path for geometry mapping that goes via layers
+        when possible. However, this broke paginated pages, which put
+        the root (RenderView) layer into column mode, because it failed
+        to check for columns on the ancestor layer.
+        
+        Rather than make a risky change to convertToLayerCoords(), add a local
+        function canMapViaLayer(), which is like RenderLayer::canUseConvertToLayerCoords(),
+        but doesn't check for compositing (compositing itself is not a reason
+        to avoid convertToLayerCoords). Call canMapViaLayer() with the ancestorLayer
+        to check whether the ancestor has columns, which fixes the bug.
+
+        Test: compositing/columns/geometry-map-paginated-assert.html
+
+        * rendering/RenderGeometryMap.cpp:
+        (WebCore::canMapViaLayer):
+        (WebCore::RenderGeometryMap::pushMappingsToAncestor):
+
 2012-07-11  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebCore/rendering/RenderGeometryMap.cpp

@@ -139 +139 @@
 }
 
+static bool canMapViaLayer(const RenderLayer* layer)
+{
+    RenderStyle* style = layer->renderer()->style();
+    if (style->position() == FixedPosition || style->isFlippedBlocksWritingMode())
+        return false;
+    
+    if (layer->renderer()->hasColumns() || layer->renderer()->hasTransform())
+        return false;
+
+#if ENABLE(SVG)
+    if (layer->renderer()->isSVGRoot())
+        return false;
+#endif
+
+    return true;
+}
+
 void RenderGeometryMap::pushMappingsToAncestor(const RenderLayer* layer, const RenderLayer* ancestorLayer)
 {
@@ -144 +161 @@
 
     // The simple case can be handled fast in the layer tree.
-    bool canConvertInLayerTree = ancestorLayer && renderer->style()->position() != FixedPosition && !renderer->style()->isFlippedBlocksWritingMode();
+    bool canConvertInLayerTree = ancestorLayer ? canMapViaLayer(ancestorLayer) : false;
     for (const RenderLayer* current = layer; current != ancestorLayer && canConvertInLayerTree; current = current->parent())
-        canConvertInLayerTree = current->canUseConvertToLayerCoords();
+        canConvertInLayerTree = canMapViaLayer(current);
 
     if (canConvertInLayerTree) {