Changeset 109186 in webkit

Timestamp:

Feb 28, 2012, 8:46:47 PM (15 years ago)

Author:

Simon Fraser

Message:

Optimize the rects being drawn into compositing layers
​https://bugs.webkit.org/show_bug.cgi?id=79852

Reviewed by Dan Bernstein.

Use the newly added WebKitSystemInterface method
to limit the area being painted in a CALayer
-drawInContext callback. This avoids redundant drawing,
for performance.

• 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 @@
+2012-02-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Optimize the rects being drawn into compositing layers
+        https://bugs.webkit.org/show_bug.cgi?id=79852
+
+        Reviewed by Dan Bernstein.
+
+        Use the newly added WebKitSystemInterface method
+        to limit the area being painted in a CALayer
+        -drawInContext callback. This avoids redundant drawing,
+        for performance.
+
+        * platform/graphics/mac/WebLayer.mm:
+        (drawLayerContents):
+
 2012-02-28  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -36 +36 @@
 #import <QuartzCore/QuartzCore.h>
 #import <wtf/UnusedParam.h>
+#import "WebCoreSystemInterface.h"
 
 @interface CALayer(WebCoreCALayerPrivate)
@@ -77 +78 @@
     // It's important to get the clip from the context, because it may be significantly
     // smaller than the layer bounds (e.g. tiled layers)
-    CGRect clipBounds = CGContextGetClipBoundingBox(context);
-    IntRect clip(enclosingIntRect(clipBounds));
+    FloatRect clipBounds = CGContextGetClipBoundingBox(context);
+
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
+    __block GraphicsContext* ctx = &graphicsContext;
+
+    wkCALayerEnumerateRectsBeingDrawnWithBlock(layer, context, ^(CGRect rect){
+        FloatRect rectBeingDrawn(rect);
+        rectBeingDrawn.intersect(clipBounds);
+        
+        GraphicsContextStateSaver stateSaver(*ctx);
+        ctx->clip(rectBeingDrawn);
+        
+        layerContents->platformCALayerPaintContents(*ctx, enclosedIntRect(rectBeingDrawn));
+    });
+#else
+    IntRect clip(enclosedIntRect(clipBounds));
     layerContents->platformCALayerPaintContents(graphicsContext, clip);
+#endif
 
     [NSGraphicsContext restoreGraphicsState];