Changeset 106304 in webkit

Timestamp:

Jan 30, 2012 5:07:43 PM (12 years ago)

Author:

andersca@apple.com

Message:

Show debug borders for individual tile cache tiles
​https://bugs.webkit.org/show_bug.cgi?id=77388

Reviewed by Sam Weinig.

• platform/graphics/GraphicsLayer.cpp:

(WebCore::GraphicsLayer::updateDebugIndicators):
Give tile cache tiles a thin dark blue border.

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

(WebCore::TileCache::tileDebugBorderWidth):
(WebCore::TileCache::tileDebugBorderColor):
Add getters and member variables for the tile debug border width and color.

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

(WebCore::TileCache::TileCache):
Initialize m_tileDebugBorderWidth.

(WebCore::TileCache::setTileDebugBorderWidth):
Update the border width of each tile layer.

(WebCore::TileCache::setTileDebugBorderColor):
Update the border color of each tile layer.

(WebCore::TileCache::createTileLayer):
Set the border color and border width.

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

(-[WebTileCacheLayer borderColor]):
(-[WebTileCacheLayer setBorderColor:]):
(-[WebTileCacheLayer borderWidth]):
(-[WebTileCacheLayer setBorderWidth:]):
Call through to the TileCache.

• platform/graphics/mac/WebLayer.mm:

(drawLayerContents):
Don't draw the repaint counter for tile cache layers, each tile will maintain its own repaint counter.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• platform/graphics/ca/mac/TileCache.h (modified) (2 diffs)
• platform/graphics/ca/mac/TileCache.mm (modified) (4 diffs)
• platform/graphics/ca/mac/WebTileCacheLayer.h (modified) (1 diff)
• platform/graphics/ca/mac/WebTileCacheLayer.mm (modified) (1 diff)
• platform/graphics/mac/WebLayer.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-30  Anders Carlsson  <andersca@apple.com>
+
+        Show debug borders for individual tile cache tiles
+        https://bugs.webkit.org/show_bug.cgi?id=77388
+
+        Reviewed by Sam Weinig.
+
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::updateDebugIndicators):
+        Give tile cache tiles a thin dark blue border.
+
+        * platform/graphics/ca/mac/TileCache.h:
+        (WebCore::TileCache::tileDebugBorderWidth):
+        (WebCore::TileCache::tileDebugBorderColor):
+        Add getters and member variables for the tile debug border width and color.
+
+        * platform/graphics/ca/mac/TileCache.mm:
+        (WebCore::TileCache::TileCache):
+        Initialize m_tileDebugBorderWidth.
+
+        (WebCore::TileCache::setTileDebugBorderWidth):
+        Update the border width of each tile layer.
+
+        (WebCore::TileCache::setTileDebugBorderColor):
+        Update the border color of each tile layer.
+
+        (WebCore::TileCache::createTileLayer):
+        Set the border color and border width.
+
+        * platform/graphics/ca/mac/WebTileCacheLayer.h:
+        * platform/graphics/ca/mac/WebTileCacheLayer.mm:
+        (-[WebTileCacheLayer borderColor]):
+        (-[WebTileCacheLayer setBorderColor:]):
+        (-[WebTileCacheLayer borderWidth]):
+        (-[WebTileCacheLayer setBorderWidth:]):
+        Call through to the TileCache.
+
+        * platform/graphics/mac/WebLayer.mm:
+        (drawLayerContents):
+        Don't draw the repaint counter for tile cache layers, each tile will maintain its own repaint counter.
+
 2012-01-30  Rakesh KN  <rakesh.kn@motorola.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -327 +327 @@
     if (GraphicsLayer::showDebugBorders()) {
         if (drawsContent()) {
-            if (m_usingTiledLayer)
+            // FIXME: It's weird to ask the client if this layer is a tile cache layer.
+            // Maybe we should just cache that information inside GraphicsLayer?
+            if (m_client->shouldUseTileCache(this)) // tile cache layer: dark blue
+                setDebugBorder(Color(0, 0, 128, 128), 0.5);
+            else if (m_usingTiledLayer)
                 setDebugBorder(Color(255, 128, 0, 128), 2); // tiled layer: orange
             else

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

@@ -58 +58 @@
     CALayer *tileContainerLayer() const { return m_tileContainerLayer.get(); }
 
+    float tileDebugBorderWidth() const { return m_tileDebugBorderWidth; }
+    void setTileDebugBorderWidth(float);
+
+    CGColorRef tileDebugBorderColor() const { return m_tileDebugBorderColor.get(); }
+    void setTileDebugBorderColor(CGColorRef);
+
 private:
     TileCache(WebTileCacheLayer*, const IntSize& tileSize);
@@ -75 +81 @@
     RetainPtr<CALayer> m_tileContainerLayer;
 
+    RetainPtr<CGColorRef> m_tileDebugBorderColor;
+    float m_tileDebugBorderWidth;
+
     // Number of tiles in each dimension.
     IntSize m_numTilesInGrid;

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

@@ -53 +53 @@
     , m_tileSize(tileSize)
     , m_tileContainerLayer(adoptCF([[CALayer alloc] init]))
+    , m_tileDebugBorderWidth(0)
     , m_acceleratesDrawing(false)
 {
@@ -115 +116 @@
 {
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-    if (acceleratesDrawing == m_acceleratesDrawing)
+    if (m_acceleratesDrawing == acceleratesDrawing)
         return;
 
@@ -125 +126 @@
     UNUSED_PARAM(acceleratesDrawing);
 #endif
+}
+
+void TileCache::setTileDebugBorderWidth(float borderWidth)
+{
+    if (m_tileDebugBorderWidth == borderWidth)
+        return;
+
+    m_tileDebugBorderWidth = borderWidth;
+    for (WebTileLayer* tileLayer in [m_tileContainerLayer.get() sublayers])
+        [tileLayer setBorderWidth:m_tileDebugBorderWidth];
+}
+
+void TileCache::setTileDebugBorderColor(CGColorRef borderColor)
+{
+    if (m_tileDebugBorderColor == borderColor)
+        return;
+
+    m_tileDebugBorderColor = borderColor;
+    for (WebTileLayer* tileLayer in [m_tileContainerLayer.get() sublayers])
+        [tileLayer setBorderColor:m_tileDebugBorderColor.get()];
 }
 
@@ -194 +215 @@
     [layer.get() setAnchorPoint:CGPointZero];
     [layer.get() setTileCache:this];
+    [layer.get() setBorderColor:m_tileDebugBorderColor.get()];
+    [layer.get() setBorderWidth:m_tileDebugBorderWidth];
 
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)

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

@@ -36 +36 @@
 
 - (CALayer *)tileContainerLayer;
+
 @end

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

@@ -78 +78 @@
 }
 
+- (CGColorRef)borderColor
+{
+    return _tileCache->tileDebugBorderColor();
+}
+
+- (void)setBorderColor:(CGColorRef)borderColor
+{
+    _tileCache->setTileDebugBorderColor(borderColor);
+}
+
+- (CGFloat)borderWidth
+{
+    return _tileCache->tileDebugBorderWidth();
+}
+
+- (void)setBorderWidth:(CGFloat)borderWidth
+{
+    _tileCache->setTileDebugBorderWidth(borderWidth);
+}
+
 @end

trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm

@@ -86 +86 @@
     layerContents = platformLayer->owner();
     ASSERT(layerContents);
-    if (layerContents && layerContents->platformCALayerShowRepaintCounter()) {
+    if (platformLayer->layerType() != PlatformCALayer::LayerTypeTileCacheLayer && layerContents && layerContents->platformCALayerShowRepaintCounter()) {
         bool isTiledLayer = [layer isKindOfClass:[CATiledLayer class]];