Changeset 120344 in webkit

Timestamp:

Jun 14, 2012, 11:33:03 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] webkitImageSmoothingEnabled canvas property does not work on redraw
​https://bugs.webkit.org/show_bug.cgi?id=89018

Patch by Justin Novosad <​junov@chromium.org> on 2012-06-14
Reviewed by Stephen White.

Source/WebCore:

Test: fast/canvas/canvas-imageSmoothingEnabled-repaint.html

When an accelerated canvas layer prepares its texture for the
compositor, it must send a notification to skia to invalidate texture
proprties that are cached by skia, since the compositor may modify them.
The use case this fixes is when a canvas to canvas copy is performed
with webkitImageSmoothingEnabled=false on the destination canvas.
The backing texture of the source canvas will be set to "nearest"
filtering by skia in order to perform the copy. Then, the compositor
sets filtering back to "linear" when the source canvas is drawn.
Skia is designed to only update GL attributes when required, so errors
occur when the skia-side GL state cache is out of sync.

• platform/graphics/chromium/Canvas2DLayerBridge.cpp:

(WebCore::Canvas2DLayerBridge::prepareTexture):

Source/WebKit/chromium:

Rolling chromium DEPS to 141884

• DEPS:

LayoutTests:

New layout test that verifies that disabling image smoothing on a 2d
canvas continues to work after multiple paint cycles.

• fast/canvas/canvas-imageSmoothingEnabled-repaint-expected.txt: Added.
• fast/canvas/canvas-imageSmoothingEnabled-repaint.html: Added.
• fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js: Added.

(draw):
(testResult):
(TestControllerPaint):
(BrowserPaint):
(onLoadHandler):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-repaint-expected.txt (added)
• LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-repaint.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/DEPS (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-14  Justin Novosad  <junov@chromium.org>
+
+        [Chromium] webkitImageSmoothingEnabled canvas property does not work on redraw
+        https://bugs.webkit.org/show_bug.cgi?id=89018
+
+        Reviewed by Stephen White.
+
+        New layout test that verifies that disabling image smoothing on a 2d
+        canvas continues to work after multiple paint cycles.
+
+        * fast/canvas/canvas-imageSmoothingEnabled-repaint-expected.txt: Added.
+        * fast/canvas/canvas-imageSmoothingEnabled-repaint.html: Added.
+        * fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js: Added.
+        (draw):
+        (testResult):
+        (TestControllerPaint):
+        (BrowserPaint):
+        (onLoadHandler):
+
 2012-06-14  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-14  Justin Novosad  <junov@chromium.org>
+
+        [Chromium] webkitImageSmoothingEnabled canvas property does not work on redraw
+        https://bugs.webkit.org/show_bug.cgi?id=89018
+
+        Reviewed by Stephen White.
+
+        Test: fast/canvas/canvas-imageSmoothingEnabled-repaint.html
+
+        When an accelerated canvas layer prepares its texture for the
+        compositor, it must send a notification to skia to invalidate texture
+        proprties that are cached by skia, since the compositor may modify them.
+        The use case this fixes is when a canvas to canvas copy is performed
+        with webkitImageSmoothingEnabled=false on the destination canvas.
+        The backing texture of the source canvas will be set to "nearest"
+        filtering by skia in order to perform the copy.  Then, the compositor
+        sets filtering back to "linear" when the source canvas is drawn.
+        Skia is designed to only update GL attributes when required, so errors
+        occur when the skia-side GL state cache is out of sync.
+
+        * platform/graphics/chromium/Canvas2DLayerBridge.cpp:
+        (WebCore::Canvas2DLayerBridge::prepareTexture):
+
 2012-06-14  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp

@@ -142 +142 @@
     }
 
+    if (m_canvas) {
+        // Notify skia that the state of the backing store texture object will be touched by the compositor
+        GrRenderTarget* renderTarget = reinterpret_cast<GrRenderTarget*>(m_canvas->getDevice()->accessRenderTarget());
+        if (renderTarget)
+            renderTarget->asTexture()->invalidateCachedState();
+    }
     return m_backBufferTexture;
 }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-14  Justin Novosad  <junov@chromium.org>
+
+        [Chromium] webkitImageSmoothingEnabled canvas property does not work on redraw
+        https://bugs.webkit.org/show_bug.cgi?id=89018
+
+        Reviewed by Stephen White.
+
+        Rolling chromium DEPS to 141884
+
+        * DEPS:
+
 2012-06-14  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '141410'
+  'chromium_rev': '141884'
 }