Changeset 106397 in webkit

Timestamp:

Jan 31, 2012 2:46:39 PM (12 years ago)

Author:

andersca@apple.com

Message:

Put tiles in a HashMap
​https://bugs.webkit.org/show_bug.cgi?id=77480

Reviewed by Antti Koivisto.

Put tiles in a hash map keyed off the tile index.

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

Shuffle member variables around so the order makes more sense.
Add the tile map.

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

(WebCore::TileCache::TileCache):
Update member initializers.

(WebCore::TileCache::setNeedsDisplayInRect):
Call tileLayerAtIndex instead of tileLayerAtPosition.

(WebCore::TileCache::setAcceleratesDrawing):
(WebCore::TileCache::setTileDebugBorderWidth):
(WebCore::TileCache::setTileDebugBorderColor):
Iterate over the hash map instead of the sublayers.

(WebCore::TileCache::resizeTileGrid):
Add the created layers to the map.

(WebCore::TileCache::tileLayerAtIndex):
Rename from tileLayerAtPoint to better reflect that this member function
returns a tile layer at the given index and not the given point.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-31  Anders Carlsson  <andersca@apple.com>
+
+        Put tiles in a HashMap
+        https://bugs.webkit.org/show_bug.cgi?id=77480
+
+        Reviewed by Antti Koivisto.
+
+        Put tiles in a hash map keyed off the tile index.
+
+        * platform/graphics/ca/mac/TileCache.h:
+        Shuffle member variables around so the order makes more sense.
+        Add the tile map.
+
+        * platform/graphics/ca/mac/TileCache.mm:
+        (WebCore::TileCache::TileCache):
+        Update member initializers.
+
+        (WebCore::TileCache::setNeedsDisplayInRect):
+        Call tileLayerAtIndex instead of tileLayerAtPosition.
+
+        (WebCore::TileCache::setAcceleratesDrawing):
+        (WebCore::TileCache::setTileDebugBorderWidth):
+        (WebCore::TileCache::setTileDebugBorderColor):
+        Iterate over the hash map instead of the sublayers.
+
+        (WebCore::TileCache::resizeTileGrid):
+        Add the created layers to the map.
+
+        (WebCore::TileCache::tileLayerAtIndex):
+        Rename from tileLayerAtPoint to better reflect that this member function
+        returns a tile layer at the given index and not the given point.
+
 2012-01-31  Antti Koivisto  <antti@apple.com>
 

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

@@ -27 +27 @@
 #define TileCache_h
 
+#include "IntPointHash.h"
 #include "IntSize.h"
+#include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
@@ -67 +69 @@
 
 private:
+    typedef IntPoint TileIndex;
+
     TileCache(WebTileCacheLayer*, const IntSize& tileSize);
 
@@ -77 +81 @@
     void resizeTileGrid(const IntSize& numTiles);
 
-    WebTileLayer* tileLayerAtPosition(const IntPoint&) const;
+    WebTileLayer* tileLayerAtIndex(const TileIndex&) const;
     RetainPtr<WebTileLayer> createTileLayer();
 
@@ -83 +87 @@
 
     WebTileCacheLayer* m_tileCacheLayer;
+    RetainPtr<CALayer> m_tileContainerLayer;
     const IntSize m_tileSize;
-
-    RetainPtr<CALayer> m_tileContainerLayer;
-
-    RetainPtr<CGColorRef> m_tileDebugBorderColor;
-    float m_tileDebugBorderWidth;
 
     // Number of tiles in each dimension.
     IntSize m_numTilesInGrid;
 
+    typedef HashMap<TileIndex, RetainPtr<WebTileLayer> > TileMap;
+    TileMap m_tiles;
+
     bool m_acceleratesDrawing;
+
+    RetainPtr<CGColorRef> m_tileDebugBorderColor;
+    float m_tileDebugBorderWidth;
 };
 

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

@@ -51 +51 @@
 TileCache::TileCache(WebTileCacheLayer* tileCacheLayer, const IntSize& tileSize)
     : m_tileCacheLayer(tileCacheLayer)
+    , m_tileContainerLayer(adoptCF([[CALayer alloc] init]))
     , m_tileSize(tileSize)
-    , m_tileContainerLayer(adoptCF([[CALayer alloc] init]))
+    , m_acceleratesDrawing(false)
     , m_tileDebugBorderWidth(0)
-    , m_acceleratesDrawing(false)
 {
     [CATransaction begin];
@@ -88 +88 @@
     for (int y = topLeft.y(); y <= bottomRight.y(); ++y) {
         for (int x = topLeft.x(); x <= bottomRight.x(); ++x) {
-            WebTileLayer* tileLayer = tileLayerAtPosition(IntPoint(x, y));
+            WebTileLayer* tileLayer = tileLayerAtIndex(IntPoint(x, y));
 
             CGRect tileRect = [m_tileCacheLayer convertRect:rect toLayer:tileLayer];
@@ -159 +159 @@
     m_acceleratesDrawing = acceleratesDrawing;
 
-    for (WebTileLayer* tileLayer in [m_tileContainerLayer.get() sublayers])
-        [tileLayer setAcceleratesDrawing:m_acceleratesDrawing];
+    for (TileMap::const_iterator it = m_tiles.begin(), end = m_tiles.end(); it != end; ++it)
+        [it->second.get() setAcceleratesDrawing:m_acceleratesDrawing];
 #else
     UNUSED_PARAM(acceleratesDrawing);
@@ -177 +177 @@
 
     m_tileDebugBorderWidth = borderWidth;
-    for (WebTileLayer* tileLayer in [m_tileContainerLayer.get() sublayers])
-        [tileLayer setBorderWidth:m_tileDebugBorderWidth];
+    for (TileMap::const_iterator it = m_tiles.begin(), end = m_tiles.end(); it != end; ++it)
+        [it->second.get() setBorderWidth:m_tileDebugBorderWidth];
 }
 
@@ -187 +187 @@
 
     m_tileDebugBorderColor = borderColor;
-    for (WebTileLayer* tileLayer in [m_tileContainerLayer.get() sublayers])
-        [tileLayer setBorderColor:m_tileDebugBorderColor.get()];
+    for (TileMap::const_iterator it = m_tiles.begin(), end = m_tiles.end(); it != end; ++it)
+        [it->second.get() setBorderColor:m_tileDebugBorderColor.get()];
 }
 
@@ -246 +246 @@
 
             if (x < m_numTilesInGrid.width() && y < m_numTilesInGrid.height()) {
-                // We can reuse the tile layer at this position.
-                tileLayer = tileLayerAtPosition(IntPoint(x, y));
+                // We can reuse the tile layer at this index.
+                tileLayer = tileLayerAtIndex(IntPoint(x, y));
             } else {
                 tileLayer = createTileLayer();
+                m_tiles.set(IntPoint(x, y), tileLayer.get());
             }
 
@@ -264 +265 @@
 }
 
-WebTileLayer* TileCache::tileLayerAtPosition(const IntPoint& point) const
-{
-    ASSERT(point.x() >= 0);
-    ASSERT(point.x() <= m_numTilesInGrid.width());
-    ASSERT(point.y() >= 0);
-    ASSERT(point.y() <= m_numTilesInGrid.height());
-
-    return [[m_tileContainerLayer.get() sublayers] objectAtIndex:point.y() * m_numTilesInGrid.width() + point.x()];
+WebTileLayer* TileCache::tileLayerAtIndex(const TileIndex& index) const
+{
+    ASSERT(index.x() >= 0);
+    ASSERT(index.x() <= m_numTilesInGrid.width());
+    ASSERT(index.y() >= 0);
+    ASSERT(index.y() <= m_numTilesInGrid.height());
+
+    return m_tiles.get(index).get();
 }