Changeset 106311 in webkit

Timestamp:

Jan 30, 2012 6:04:09 PM (12 years ago)

Author:

andersca@apple.com

Message:

Show repaint counters in individual tiles
​https://bugs.webkit.org/show_bug.cgi?id=77390
<rdar://problem/10767967>

Reviewed by Darin Adler.

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

(WebCore::TileCache::setNeedsDisplayInRect):
Make sure to invalidate the repaint counter rect if necessary.

(WebCore::TileCache::drawLayer):
Draw the repaint counter.

(WebCore::TileCache::showRepaintCounter):
New function that determines whether we should show repaint counters for the given tile cache.

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

(-[WebTileLayer incrementRepaintCount]):
Add method for getting the repaint count.

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)
• platform/graphics/ca/mac/WebTileLayer.h (modified) (1 diff)
• platform/graphics/ca/mac/WebTileLayer.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-30  Anders Carlsson  <andersca@apple.com>
+
+        Show repaint counters in individual tiles
+        https://bugs.webkit.org/show_bug.cgi?id=77390
+        <rdar://problem/10767967>
+
+        Reviewed by Darin Adler.
+
+        * platform/graphics/ca/mac/TileCache.h:
+        * platform/graphics/ca/mac/TileCache.mm:
+        (WebCore::TileCache::setNeedsDisplayInRect):
+        Make sure to invalidate the repaint counter rect if necessary.
+
+        (WebCore::TileCache::drawLayer):
+        Draw the repaint counter.
+
+        (WebCore::TileCache::showRepaintCounter):
+        New function that determines whether we should show repaint counters for the given tile cache.
+
+        * platform/graphics/ca/mac/WebTileLayer.h:
+        * platform/graphics/ca/mac/WebTileLayer.mm:
+        (-[WebTileLayer incrementRepaintCount]):
+        Add method for getting the repaint count.
+
 2012-01-30  Dan Bernstein  <mitz@apple.com>
 

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

@@ -76 +76 @@
     RetainPtr<WebTileLayer> createTileLayer();
 
+    bool shouldShowRepaintCounters() const;
+
     WebTileCacheLayer* m_tileCacheLayer;
     const IntSize m_tileSize;

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

@@ -92 +92 @@
             CGRect tileRect = [m_tileCacheLayer convertRect:rect toLayer:tileLayer];
 
-            if (!CGRectIsEmpty(tileRect))
+            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];
+                }
+            }
         }
     }
@@ -110 +117 @@
     drawLayerContents(context, layer, platformLayer);
 
+    CGContextRestoreGState(context);
+
+    unsigned repaintCount = [layer incrementRepaintCount];
+    if (!shouldShowRepaintCounters())
+        return;
+
+    // FIXME: Some of this code could be shared with WebLayer.
+    char text[16]; // that's a lot of repaints
+    snprintf(text, sizeof(text), "%d", repaintCount);
+
+    CGRect indicatorBox = [layer bounds];
+    indicatorBox.size.width = 12 + 10 * strlen(text);
+    indicatorBox.size.height = 27;
+    CGContextSaveGState(context);
+
+    CGContextSetAlpha(context, 0.5f);
+    CGContextBeginTransparencyLayerWithRect(context, indicatorBox, 0);
+
+    CGContextSetFillColorWithColor(context, m_tileDebugBorderColor.get());
+    CGContextFillRect(context, indicatorBox);
+
+    if (platformLayer->acceleratesDrawing())
+        CGContextSetRGBFillColor(context, 1, 0, 0, 1);
+    else
+        CGContextSetRGBFillColor(context, 1, 1, 1, 1);
+
+    CGContextSetTextMatrix(context, CGAffineTransformMakeScale(1, -1));
+    CGContextSelectFont(context, "Helvetica", 22, kCGEncodingMacRoman);
+    CGContextShowTextAtPoint(context, indicatorBox.origin.x + 5, indicatorBox.origin.y + 22, text, strlen(text));
+
+    CGContextEndTransparencyLayer(context);
     CGContextRestoreGState(context);
 }
@@ -225 +263 @@
 }
 
+bool TileCache::shouldShowRepaintCounters() const
+{
+    PlatformCALayer* platformLayer = PlatformCALayer::platformCALayer(m_tileCacheLayer);
+    if (!platformLayer)
+        return false;
+
+    WebCore::PlatformCALayerClient* layerContents = platformLayer->owner();
+    ASSERT(layerContents);
+    if (!layerContents)
+        return false;
+
+    return layerContents->platformCALayerShowRepaintCounter();
+}
+
 } // namespace WebCore

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

@@ -33 +33 @@
 @interface WebTileLayer : CALayer {
     WebCore::TileCache* _tileCache;
+    unsigned _repaintCount;
 }
+
 - (void)setTileCache:(WebCore::TileCache*)tileCache;
+- (unsigned)incrementRepaintCount;
 @end
 

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

@@ -53 +53 @@
 }
 
+- (unsigned)incrementRepaintCount
+{
+    return ++_repaintCount;
+}
+
 @end