Changeset 132542 in webkit

Timestamp:

Oct 25, 2012 4:13:25 PM (12 years ago)

Author:

Simon Fraser

Message:

Tiled layers are missing content on zooming
​https://bugs.webkit.org/show_bug.cgi?id=100422

Reviewed by Beth Dakin.

Source/WebCore:

Tiled layers using TileCaches were missing content after
zooming. TileCache was confused in the presence of scaling;
it unapplies the scale on the layer above the tiles (so the tiles
live in screen space), and computed the tile coverage rect
in these tile coordinates. This worked for the page tile cache,
because its visibleRect was sent in pre-scaled. However, for
tiled layer TileCaches this was wrong.

Fix by scaling the tile coverage rect by m_scale before
using it to compute which tiles to throw away and bring in.

To fix the problem of the visibleRect being pre-scaled
for the page tile cache, remove the setting of the visibleRect
in RenderLayerCompositor::frameViewDidScroll(), and rely on
GraphicsLayerCA::updateVisibleRect() which computes the
visible rect in the correct, layer coordinates.

Test: compositing/tiling/tile-cache-zoomed.html

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::updateVisibleRect): Call setVisibleRect()
for all tile cache layers, not just tiled layer ones, but only do
the visible rect adjustment for those that are not the page tile cache.

• platform/graphics/ca/mac/TileCache.mm:

(WebCore::TileCache::revalidateTiles): Use a coverageRectInTileCoords rect,
which is scaled to be in the same coordinate space as the tile grid.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::frameViewDidScroll): Remove the code
that sets the setVisibleRect() on the TiledBacking.

LayoutTests:

New test for zooming with a tiled layer, and adjust an existing result.

• compositing/tiling/tile-cache-zoomed-expected.txt: Added.
• compositing/tiling/tile-cache-zoomed.html: Added.
• platform/mac/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/tiling/tile-cache-zoomed-expected.txt (added)
• LayoutTests/compositing/tiling/tile-cache-zoomed.html (added)
• LayoutTests/platform/mac/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/mac/TileCache.mm (modified) (3 diffs)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-25  Simon Fraser  <simon.fraser@apple.com>
+
+        Tiled layers are missing content on zooming
+        https://bugs.webkit.org/show_bug.cgi?id=100422
+
+        Reviewed by Beth Dakin.
+
+        New test for zooming with a tiled layer, and adjust an existing result.
+        
+        * compositing/tiling/tile-cache-zoomed-expected.txt: Added.
+        * compositing/tiling/tile-cache-zoomed.html: Added.
+        * platform/mac/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt:
+
 2012-10-25  Roger Fong  <roger_fong@apple.com>
 

trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt

@@ -8 +8 @@
       (backgroundColor #FFFFFF)
       (visible rect 0.00, 5000.00 785.00 x 21.00)
-      (tile cache coverage 0, 4096 785 x 925)
+      (tile cache coverage 0, 4608 785 x 413)
       (tile size 512 x 512)
       (children 1

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-25  Simon Fraser  <simon.fraser@apple.com>
+
+        Tiled layers are missing content on zooming
+        https://bugs.webkit.org/show_bug.cgi?id=100422
+
+        Reviewed by Beth Dakin.
+
+        Tiled layers using TileCaches were missing content after
+        zooming. TileCache was confused in the presence of scaling;
+        it unapplies the scale on the layer above the tiles (so the tiles
+        live in screen space), and computed the tile coverage rect
+        in these tile coordinates. This worked for the page tile cache,
+        because its visibleRect was sent in pre-scaled. However, for
+        tiled layer TileCaches this was wrong.
+        
+        Fix by scaling the tile coverage rect by m_scale before
+        using it to compute which tiles to throw away and bring in.
+        
+        To fix the problem of the visibleRect being pre-scaled
+        for the page tile cache, remove the setting of the visibleRect
+        in RenderLayerCompositor::frameViewDidScroll(), and rely on 
+        GraphicsLayerCA::updateVisibleRect() which computes the
+        visible rect in the correct, layer coordinates.
+
+        Test: compositing/tiling/tile-cache-zoomed.html
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::updateVisibleRect): Call setVisibleRect()
+        for all tile cache layers, not just tiled layer ones, but only do
+        the visible rect adjustment for those that are not the page tile cache.
+        * platform/graphics/ca/mac/TileCache.mm:
+        (WebCore::TileCache::revalidateTiles): Use a coverageRectInTileCoords rect,
+        which is scaled to be in the same coordinate space as the tile grid.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::frameViewDidScroll): Remove the code
+        that sets the setVisibleRect() on the TiledBacking.
+
 2012-10-25  Adam Barth  <abarth@webkit.org>
 

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

@@ -1594 +1594 @@
 void GraphicsLayerCA::updateVisibleRect(const FloatRect& oldVisibleRect)
 {
-    if (m_layer->layerType() != PlatformCALayer::LayerTypeTileCacheLayer)
-        return;
-
-    FloatRect tileArea = adjustTiledLayerVisibleRect(tiledBacking(), oldVisibleRect, m_sizeAtLastVisibleRectUpdate);
+    if (!m_layer->usesTileCacheLayer())
+        return;
+
+    FloatRect tileArea = m_visibleRect;
+    if (m_layer->layerType() == PlatformCALayer::LayerTypeTileCacheLayer)
+        tileArea = adjustTiledLayerVisibleRect(tiledBacking(), oldVisibleRect, m_sizeAtLastVisibleRectUpdate);
+
     tiledBacking()->setVisibleRect(enclosingIntRect(tileArea));
 

trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.mm

@@ -393 +393 @@
 
     IntRect tileCoverageRect = computeTileCoverageRect();
+    IntRect coverageRectInTileCoords(tileCoverageRect);
+    coverageRectInTileCoords.scale(m_scale);
 
     IntSize oldTileSize = m_tileSize;
@@ -405 +407 @@
         WebTileLayer* tileLayer = it->value.get();
 
-        if (!rectForTileIndex(tileIndex).intersects(tileCoverageRect) || tileSizeChanged) {
+        if (!rectForTileIndex(tileIndex).intersects(coverageRectInTileCoords) || tileSizeChanged) {
             // Remove this layer.
             [tileLayer removeFromSuperlayer];
@@ -422 +424 @@
     TileIndex topLeft;
     TileIndex bottomRight;
-    getTileIndexRangeForRect(tileCoverageRect, topLeft, bottomRight);
+    getTileIndexRangeForRect(coverageRectInTileCoords, topLeft, bottomRight);
 
     Vector<FloatRect> dirtyRects;

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1101 +1101 @@
     IntPoint scrollPosition = frameView->scrollPosition();
 
-    if (TiledBacking* tiledBacking = frameView->tiledBacking()) {
-        IntRect visibleContentRect = frameView->visibleContentRect(false /* exclude scrollbars */);
-        visibleContentRect.move(toSize(frameView->scrollOrigin()));
-        tiledBacking->setVisibleRect(visibleContentRect);
-    }
-
     if (!m_scrollLayer)
         return;