Changeset 106411 in webkit

Timestamp:

Jan 31, 2012 3:58:04 PM (12 years ago)

Author:

andersca@apple.com

Message:

TileCache::setNeedsDisplayInRect cleanup
​https://bugs.webkit.org/show_bug.cgi?id=77486

Reviewed by Andreas Kling.

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

(WebCore::TileCache::setNeedsDisplayInRect):
TileCache::tileLayerAtIndex can in the future return nil, so cope with that. Also, replace
nested if statements with continue statements.

(WebCore::TileCache::getTileIndexRangeForRect):
Rename this to better indicate that it returns a range of indices.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/mac/TileCache.h (modified) (1 diff)
• platform/graphics/ca/mac/TileCache.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-31  Anders Carlsson  <andersca@apple.com>
+
+        TileCache::setNeedsDisplayInRect cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=77486
+
+        Reviewed by Andreas Kling.
+
+        * platform/graphics/ca/mac/TileCache.h:
+        * platform/graphics/ca/mac/TileCache.mm:
+        (WebCore::TileCache::setNeedsDisplayInRect):
+        TileCache::tileLayerAtIndex can in the future return nil, so cope with that. Also, replace
+        nested if statements with continue statements.
+
+        (WebCore::TileCache::getTileIndexRangeForRect):
+        Rename this to better indicate that it returns a range of indices.
+
 2012-01-31  Dana Jansens  <danakj@chromium.org>
 

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

@@ -76 +76 @@
 
     IntRect bounds() const;
-    void getTileRangeForRect(const IntRect&, IntPoint& topLeft, IntPoint& bottomRight);
+    void getTileIndexRangeForRect(const IntRect&, TileIndex& topLeft, TileIndex& bottomRight);
 
     IntSize numTilesForGridSize(const IntSize&) const;

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

@@ -82 +82 @@
 
     // Find the tiles that need to be invalidated.
-    IntPoint topLeft;
-    IntPoint bottomRight;
-    getTileRangeForRect(rect, topLeft, bottomRight);
+    TileIndex topLeft;
+    TileIndex bottomRight;
+    getTileIndexRangeForRect(rect, topLeft, bottomRight);
 
     for (int y = topLeft.y(); y <= bottomRight.y(); ++y) {
         for (int x = topLeft.x(); x <= bottomRight.x(); ++x) {
-            WebTileLayer* tileLayer = tileLayerAtIndex(IntPoint(x, y));
+            WebTileLayer* tileLayer = tileLayerAtIndex(TileIndex(x, y));
+            if (!tileLayer)
+                continue;
 
             CGRect tileRect = [m_tileCacheLayer convertRect:rect toLayer:tileLayer];
-
-            if (!CGRectIsEmpty(tileRect)) {
-                [tileLayer setNeedsDisplayInRect:tileRect];
-
-                if (shouldShowRepaintCounters()) {
-                    CGRect bounds = [tileLayer bounds];
-                    CGRect indicatorRect = CGRectMake(bounds.origin.x, bounds.origin.y, 52, 27);
-                    [tileLayer setNeedsDisplayInRect:indicatorRect];
-                }
+            if (CGRectIsEmpty(tileRect))
+                continue;
+
+            [tileLayer setNeedsDisplayInRect:tileRect];
+
+            if (shouldShowRepaintCounters()) {
+                CGRect bounds = [tileLayer bounds];
+                CGRect indicatorRect = CGRectMake(bounds.origin.x, bounds.origin.y, 52, 27);
+                [tileLayer setNeedsDisplayInRect:indicatorRect];
             }
         }
@@ -218 +220 @@
 }
 
-void TileCache::getTileRangeForRect(const IntRect& rect, IntPoint& topLeft, IntPoint& bottomRight)
+void TileCache::getTileIndexRangeForRect(const IntRect& rect, TileIndex& topLeft, TileIndex& bottomRight)
 {
     topLeft.setX(max(rect.x() / m_tileSize.width(), 0));
@@ -247 +249 @@
             if (x < m_numTilesInGrid.width() && y < m_numTilesInGrid.height()) {
                 // We can reuse the tile layer at this index.
-                tileLayer = tileLayerAtIndex(IntPoint(x, y));
+                tileLayer = tileLayerAtIndex(TileIndex(x, y));
             } else {
                 tileLayer = createTileLayer();
-                m_tiles.set(IntPoint(x, y), tileLayer.get());
+                m_tiles.set(TileIndex(x, y), tileLayer.get());
             }