Changeset 81317 in webkit

Timestamp:

Mar 16, 2011 8:56:13 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-16 John Bauman <​jbauman@chromium.org>

Reviewed by James Robinson.

texImage2D gets old contents of canvas
​https://bugs.webkit.org/show_bug.cgi?id=56414

• platform/chromium/test_expectations.txt: premultiply-alpha test now works

2011-03-16 John Bauman <​jbauman@chromium.org>

Reviewed by James Robinson.

texImage2D gets old contents of canvas
​https://bugs.webkit.org/show_bug.cgi?id=56414

Always update the canvas contents in copiedImage, as there's no reason
to ask for an out-of-date image.

• html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::copiedImage):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-16  John Bauman  <jbauman@chromium.org>
+
+        Reviewed by James Robinson.
+
+        texImage2D gets old contents of canvas
+        https://bugs.webkit.org/show_bug.cgi?id=56414
+
+        * platform/chromium/test_expectations.txt: premultiply-alpha test now works
+
 2011-03-16  Sam Weinig  <sam@webkit.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2353 +2353 @@
 BUGWEBGL GPU WIN DEBUG SLOW : fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html = PASS
 BUGWEBGL GPU WIN DEBUG SLOW : fast/canvas/webgl/index-validation-with-resized-buffer.html = PASS
-
-BUGWK56414 : fast/canvas/webgl/premultiplyalpha-test.html = TEXT
 
 // These were not fixed by the Mesa 7.9 upgrade. Need to investigate.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-16  John Bauman  <jbauman@chromium.org>
+
+        Reviewed by James Robinson.
+
+        texImage2D gets old contents of canvas
+        https://bugs.webkit.org/show_bug.cgi?id=56414
+
+        Always update the canvas contents in copiedImage, as there's no reason
+        to ask for an out-of-date image.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::copiedImage):
+
 2011-03-16  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -462 +462 @@
 {
     if (!m_copiedImage && buffer()) {
-        if (m_context) {
-            // If we're not rendering to the ImageBuffer, copy the rendering results to it.
-            if (!m_context->paintsIntoCanvasBuffer())
-                m_context->paintRenderingResultsToCanvas();
-        }
+        if (m_context)
+            m_context->paintRenderingResultsToCanvas();
         m_copiedImage = buffer()->copyImage();
     }