Changeset 248514 in webkit

Timestamp:

Aug 10, 2019 9:03:56 PM (5 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r245974): Missing content on habitburger.com, amazon.com
​https://bugs.webkit.org/show_bug.cgi?id=200618
rdar://problem/53920224

Reviewed by Zalan Bujtas.

Source/WebCore:

In r245974 TileController::adjustTileCoverageRect() started to intersect the coverage
rect with the bounds of the layer, which is wrong because this coverage rect is passed down
to descendant layers, and they may project outside the bounds of this tiled layer.

This caused missing dropdowns on amazon.com, and a missing menu on habitburger.com on iPhone.

The fix is to just not do the intersection with the bounds. TileGrid::getTileIndexRangeForRect()
already ensures that we never make tiles outside the bounds of a TileController.

Test: compositing/backing/layer-outside-tiled-parent.html

• platform/graphics/ca/TileController.cpp:

(WebCore::TileController::adjustTileCoverageRect):

• platform/graphics/ca/TileGrid.cpp:

(WebCore::TileGrid::ensureTilesForRect):

LayoutTests:

• compositing/backing/layer-outside-tiled-parent-expected.txt: Added.
• compositing/backing/layer-outside-tiled-parent.html: Added.
• platform/ios-wk2/compositing/backing/layer-outside-tiled-parent-expected.txt: Added.
• tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt:
• tiled-drawing/tiled-backing-in-window-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/backing/layer-outside-tiled-parent-expected.txt (added)
• LayoutTests/compositing/backing/layer-outside-tiled-parent.html (added)
• LayoutTests/platform/ios-wk2/compositing/backing/layer-outside-tiled-parent-expected.txt (added)
• LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt (modified) (1 diff)
• LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/TileController.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/TileGrid.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-10  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r245974): Missing content on habitburger.com, amazon.com
+        https://bugs.webkit.org/show_bug.cgi?id=200618
+        rdar://problem/53920224
+
+        Reviewed by Zalan Bujtas.
+
+        * compositing/backing/layer-outside-tiled-parent-expected.txt: Added.
+        * compositing/backing/layer-outside-tiled-parent.html: Added.
+        * platform/ios-wk2/compositing/backing/layer-outside-tiled-parent-expected.txt: Added.
+        * tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt:
+        * tiled-drawing/tiled-backing-in-window-expected.txt:
+
 2019-08-10  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/LayoutTests/tiled-drawing/tile-coverage-iframe-to-zero-coverage-expected.txt

@@ -80 +80 @@
                                   (drawsContent 1)
                                   (visible rect 0.00, 0.00 0.00 x 0.00)
-                                  (coverage rect 0.00, 0.00 0.00 x 0.00)
+                                  (coverage rect -8.00, -8.00 0.00 x 0.00)
                                   (intersects coverage rect 0)
                                   (contentsScale 1.00)

trunk/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt

@@ -64 +64 @@
           (drawsContent 1)
           (visible rect 0.00, 0.00 777.00 x 200.00)
-          (coverage rect 0.00, 0.00 777.00 x 200.00)
+          (coverage rect -8.00, -8.00 785.00 x 585.00)
           (intersects coverage rect 1)
           (contentsScale 1.00)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-10  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r245974): Missing content on habitburger.com, amazon.com
+        https://bugs.webkit.org/show_bug.cgi?id=200618
+        rdar://problem/53920224
+
+        Reviewed by Zalan Bujtas.
+
+        In r245974 TileController::adjustTileCoverageRect() started to intersect the coverage
+        rect with the bounds of the layer, which is wrong because this coverage rect is passed down
+        to descendant layers, and they may project outside the bounds of this tiled layer.
+        
+        This caused missing dropdowns on amazon.com, and a missing menu on habitburger.com on iPhone.
+
+        The fix is to just not do the intersection with the bounds. TileGrid::getTileIndexRangeForRect()
+        already ensures that we never make tiles outside the bounds of a TileController.
+
+        Test: compositing/backing/layer-outside-tiled-parent.html
+
+        * platform/graphics/ca/TileController.cpp:
+        (WebCore::TileController::adjustTileCoverageRect):
+        * platform/graphics/ca/TileGrid.cpp:
+        (WebCore::TileGrid::ensureTilesForRect):
+
 2019-08-10  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/TileController.cpp

@@ -369 +369 @@
         return unionRect(coverageRect, currentVisibleRect);
 
-    auto expandedCoverageRect = GraphicsLayer::adjustCoverageRectForMovement(coverageRect, previousVisibleRect, currentVisibleRect);
-    return intersection(expandedCoverageRect, boundsWithoutMargin());
+    return GraphicsLayer::adjustCoverageRectForMovement(coverageRect, previousVisibleRect, currentVisibleRect);
 }
 

trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp

@@ -558 +558 @@
         return IntRect();
 
-    LOG_WITH_STREAM(Tiling, stream << "TileGrid " << this << " ensureTilesForRect: " << rect);
-
     FloatRect scaledRect(rect);
     scaledRect.scale(m_scale);
@@ -609 +607 @@
         }
     }
-    
+
     if (tilesInCohort)
         startedNewCohort(currCohort);
+
+    LOG_WITH_STREAM(Tiling, stream << "TileGrid " << this << " (bounds " << m_controller.bounds() << ") ensureTilesForRect: " << rect << " covered " << coverageRect);
 
     return coverageRect;