Changeset 169097 in webkit

Timestamp:

May 19, 2014, 7:31:19 PM (12 years ago)

Author:

Simon Fraser

Message:

Scrolling pages with large TiledBacking content layers creates way too many tiles
​https://bugs.webkit.org/show_bug.cgi?id=133101

Reviewed by Tim Horton.

Fix the GraphicsLayerCA::adjustTiledLayerVisibleRect() logic to avoid making giant rects if the old
and new visible rects don't overlap.

• platform/graphics/TiledBacking.h:
• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::adjustTiledLayerVisibleRect):

• platform/graphics/ca/mac/TileController.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/TiledBacking.h (modified) (1 diff)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (2 diffs)
• platform/graphics/ca/mac/TileController.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-19  Simon Fraser  <simon.fraser@apple.com>
+
+        Scrolling pages with large TiledBacking content layers creates way too many tiles
+        https://bugs.webkit.org/show_bug.cgi?id=133101
+
+        Reviewed by Tim Horton.
+
+        Fix the GraphicsLayerCA::adjustTiledLayerVisibleRect() logic to avoid making giant rects if the old
+        and new visible rects don't overlap.
+
+        * platform/graphics/TiledBacking.h:
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::adjustTiledLayerVisibleRect):
+        * platform/graphics/ca/mac/TileController.h:
+
 2014-05-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/TiledBacking.h

@@ -97 +97 @@
     // Includes margins.
     virtual IntRect bounds() const = 0;
+    virtual IntRect boundsWithoutMargin() const = 0;
 
     // Exposed for testing

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

@@ -1859 +1859 @@
     // If the old visible rect is empty, we have no information about how the visible area is changing
     // (maybe the layer was just created), so don't attempt to expand. Also don't attempt to expand
-    // if the size changed.
-    if (oldVisibleRect.isEmpty() || newSize != oldSize)
+    // if the size changed or the rects don't overlap.
+    if (oldVisibleRect.isEmpty() || newSize != oldSize || !newVisibleRect.intersects(oldVisibleRect))
         return newVisibleRect;
 
@@ -1912 +1912 @@
     }
     
+    expandedRect.intersect(tiledBacking->boundsWithoutMargin());
     return expandedRect;
 }

trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h

@@ -97 +97 @@
     virtual IntSize tileSize() const override { return m_tileSize; }
     virtual IntRect bounds() const override;
+    virtual IntRect boundsWithoutMargin() const override;
     virtual bool hasMargins() const override;
     virtual bool hasHorizontalMargins() const override;
@@ -107 +108 @@
     virtual bool unparentsOffscreenTiles() const override { return m_unparentsOffscreenTiles; }
     virtual bool scrollingPerformanceLoggingEnabled() const override { return m_scrollingPerformanceLoggingEnabled; }
-
-    IntRect boundsWithoutMargin() const;
 
     FloatRect computeTileCoverageRect(const FloatRect& previousVisibleRect, const FloatRect& currentVisibleRect) const;