Changeset 95193 in webkit

Timestamp:

Sep 15, 2011 9:09:59 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Don't bother calculating dirty rect for accelerated 2D canvases.
​https://bugs.webkit.org/show_bug.cgi?id=68158

Patch by Andreas Kling <​kling@webkit.org> on 2011-09-15
Reviewed by Kenneth Rohde Christiansen.

For accelerated CanvasRenderingContext2D, didDraw() simply calls out
to RenderLayer::contentChanged(). Move this to the top of didDraw()
so we don't waste time calculating a precise dirty rect.

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::didDraw):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/CanvasRenderingContext2D.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-15  Andreas Kling  <kling@webkit.org>
+
+        Don't bother calculating dirty rect for accelerated 2D canvases.
+        https://bugs.webkit.org/show_bug.cgi?id=68158
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        For accelerated CanvasRenderingContext2D, didDraw() simply calls out
+        to RenderLayer::contentChanged(). Move this to the top of didDraw()
+        so we don't waste time calculating a precise dirty rect.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::didDraw):
+
 2011-09-15  Brian Salomon  <bsalomon@google.com>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1622 +1622 @@
         return;
 
+#if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING)
+    // If we are drawing to hardware and we have a composited layer, just call contentChanged().
+    if (isAccelerated()) {
+        RenderBox* renderBox = canvas()->renderBox();
+        if (renderBox && renderBox->hasLayer() && renderBox->layer()->hasAcceleratedCompositing()) {
+            renderBox->layer()->contentChanged(RenderLayer::CanvasChanged);
+            return;
+        }
+    }
+#endif
+
     FloatRect dirtyRect = r;
     if (options & CanvasDidDrawApplyTransform) {
@@ -1642 +1653 @@
     }
 
-#if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING)
-    // If we are drawing to hardware and we have a composited layer, just call contentChanged().
-    RenderBox* renderBox = canvas()->renderBox();
-    if (isAccelerated() && renderBox && renderBox->hasLayer() && renderBox->layer()->hasAcceleratedCompositing())
-        renderBox->layer()->contentChanged(RenderLayer::CanvasChanged);
-    else
-#endif
-        canvas()->didDraw(dirtyRect);
+    canvas()->didDraw(dirtyRect);
 }