Changeset 154469 in webkit

Timestamp:

Aug 22, 2013 5:28:45 PM (11 years ago)

Author:

Simon Fraser

Message:

Repaint counters are sometimes not in the corner of the compositing layer
​https://bugs.webkit.org/show_bug.cgi?id=120176

Reviewed by Beth Dakin.

Sometimes the repaint counters are not in the corner of the compositing layer;
they are either inset, or partially or entirely outside the layer.

Fix by making sure that we restore the CGContext before drawing
the counter, since the WebCore code may have translated the CTM.

The counter-painting code saves and restores the context itself,
so this is safe.

• platform/graphics/mac/WebLayer.mm:

(drawLayerContents):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/WebLayer.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Repaint counters are sometimes not in the corner of the compositing layer
+        https://bugs.webkit.org/show_bug.cgi?id=120176
+
+        Reviewed by Beth Dakin.
+
+        Sometimes the repaint counters are not in the corner of the compositing layer;
+        they are either inset, or partially or entirely outside the layer.
+        
+        Fix by making sure that we restore the CGContext before drawing
+        the counter, since the WebCore code may have translated the CTM.
+        
+        The counter-painting code saves and restores the context itself,
+        so this is safe.
+
+        * platform/graphics/mac/WebLayer.mm:
+        (drawLayerContents):
+
 2013-08-22  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -127 +127 @@
     ASSERT(layerContents);
 
+    CGContextRestoreGState(context);
+
     // Always update the repain count so that it's accurate even if the count itself is not shown. This will be useful
     // for the Web Inspector feeding this information through the LayerTreeAgent. 
@@ -167 +169 @@
         CGContextRestoreGState(context);
     }
-
-    CGContextRestoreGState(context);
 }