Changeset 121987 in webkit

Timestamp:

Jul 6, 2012 10:47:34 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Drawing to accelerated 2D canvas causes compositor to recompute layer tree
​https://bugs.webkit.org/show_bug.cgi?id=90630

Patch by Justin Novosad <​junov@chromium.org> on 2012-07-06
Reviewed by Simon Fraser.

No new tests: covered by existing canvas/compositing layout tests

Before this change, there was no distinction between canvas changes
that require recomputing the compositor tree and canvas changes that
only require re-display. The new CanvasPixelsChanged member of enum
ContentChangeType requests re-display without re-layout.

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::didDraw):

• rendering/RenderBoxModelObject.h:
• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::contentChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-06  Justin Novosad  <junov@chromium.org>
+
+        Drawing to accelerated 2D canvas causes compositor to recompute layer tree
+        https://bugs.webkit.org/show_bug.cgi?id=90630
+
+        Reviewed by Simon Fraser.
+
+        No new tests: covered by existing canvas/compositing layout tests
+
+        Before this change, there was no distinction between canvas changes
+        that require recomputing the compositor tree and canvas changes that
+        only require re-display. The new CanvasPixelsChanged member of enum
+        ContentChangeType requests re-display without re-layout.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::didDraw):
+        * rendering/RenderBoxModelObject.h:
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::contentChanged):
+
 2012-07-06  Pavel Feldman  <pfeldman@chromium.org>
 

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

@@ -1769 +1769 @@
         RenderBox* renderBox = canvas()->renderBox();
         if (renderBox && renderBox->hasAcceleratedCompositing()) {
-            renderBox->contentChanged(CanvasChanged);
+            renderBox->contentChanged(CanvasPixelsChanged);
             canvas()->clearCopiedImage();
             return;

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -45 +45 @@
     MaskImageChanged,
     CanvasChanged,
+    CanvasPixelsChanged,
     VideoChanged,
     FullScreenChanged

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1034 +1034 @@
 
 #if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS)
-    if ((changeType == CanvasChanged) && isAcceleratedCanvas(renderer())) {
+    if ((changeType == CanvasChanged || changeType == CanvasPixelsChanged) && isAcceleratedCanvas(renderer())) {
         m_graphicsLayer->setContentsNeedsDisplay();
         return;