Changeset 102244 in webkit

Timestamp:

Dec 7, 2011 10:08:25 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebCore: [CHROMIUM/SKIA] Handle put[Un/Pre]multipliedImageData conversions in Skia rather than ImageBuffer
​https://bugs.webkit.org/show_bug.cgi?id=73953

Patch by Brian Salomon <​bsalomon@google.com> on 2011-12-07
Reviewed by Stephen White.

Tested by existing canvas2d layout tests.

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::putImageData):
(WebCore::ImageBuffer::putUnmultipliedImageData):
(WebCore::ImageBuffer::putPremultipliedImageData):

LayoutTests: [CHROMIUM] Make canvas/philip/tests/2d.imageData.put.unchanged.html be expected to fail
on the GPU due to slight difference in alpha-premul computation.

​https://bugs.webkit.org/show_bug.cgi?id=73953

Patch by Brian Salomon <​bsalomon@google.com> on 2011-12-07
Reviewed by Stephen White.

• platform/chromium/test_expectations.txt:

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/platform/graphics/skia/ImageBufferSkia.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-07  Brian Salomon  <bsalomon@google.com>
+
+        [CHROMIUM] Make canvas/philip/tests/2d.imageData.put.unchanged.html be expected to fail
+        on the GPU due to slight difference in alpha-premul computation.
+
+        https://bugs.webkit.org/show_bug.cgi?id=73953
+
+        Reviewed by Stephen White.
+
+        * platform/chromium/test_expectations.txt:
+
 2011-12-07  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2654 +2654 @@
 //
 
+// This test expects that putImageData followed by getImageData at the same location
+// will return the exact same pixel values. However, the spec allows some fuzziness
+// due to conversion to/from premultiplied-alpha. When we do the conversions on the
+// GPU we may be off by one in r, g, and/or b.
+BUGWK73952 GPU : canvas/philip/tests/2d.imageData.put.unchanged.html = TEXT
+
 // Will need windows and linux baselines
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-07  Brian Salomon  <bsalomon@google.com>
+
+        [CHROMIUM/SKIA] Handle put[Un/Pre]multipliedImageData conversions in Skia rather than ImageBuffer
+        https://bugs.webkit.org/show_bug.cgi?id=73953
+
+        Reviewed by Stephen White.
+
+        Tested by existing canvas2d layout tests.
+
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::putImageData):
+        (WebCore::ImageBuffer::putUnmultipliedImageData):
+        (WebCore::ImageBuffer::putPremultipliedImageData):
+
 2011-12-07  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -293 +293 @@
 template <Multiply multiplied>
 void putImageData(ByteArray*& source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint,
-                  SkDevice* dstDevice, const IntSize& size)
+                  SkCanvas* canvas, const IntSize& size)
 {
     ASSERT(sourceRect.width() > 0);
@@ -322 +322 @@
 
     unsigned srcBytesPerRow = 4 * sourceSize.width();
-
-    SkBitmap deviceBitmap = dstDevice->accessBitmap(true);
-
-    // If the device's bitmap doesn't have pixels we will make a temp and call writePixels on the device.
-    bool temporaryBitmap = !!deviceBitmap.getTexture();
-    SkBitmap destBitmap;
-
-    if (temporaryBitmap) {
-        destBitmap.setConfig(SkBitmap::kARGB_8888_Config, numColumns, numRows, srcBytesPerRow);
-        if (!destBitmap.allocPixels())
-            CRASH();
-    } else
-        deviceBitmap.extractSubset(&destBitmap, SkIRect::MakeXYWH(destX, destY, numColumns, numRows));
-
-    // Whether we made a temporary or not destBitmap is always configured to be written at 0,0
-    SkAutoLockPixels destAutoLock(destBitmap);
-    const unsigned char* srcRow = source->data() + originY * srcBytesPerRow + originX * 4;
-    for (int y = 0; y < numRows; ++y) {
-        SkPMColor* destRow = destBitmap.getAddr32(0, y);
-        for (int x = 0; x < numColumns; ++x) {
-            const unsigned char* srcPixel = &srcRow[x * 4];
-            if (multiplied == Unmultiplied) {
-                unsigned char alpha = srcPixel[3];
-                unsigned char r = SkMulDiv255Ceiling(srcPixel[0], alpha);
-                unsigned char g = SkMulDiv255Ceiling(srcPixel[1], alpha);
-                unsigned char b = SkMulDiv255Ceiling(srcPixel[2], alpha);
-                destRow[x] = SkPackARGB32(alpha, r, g, b);
-            } else
-                destRow[x] = SkPackARGB32NoCheck(srcPixel[3], srcPixel[0], srcPixel[1], srcPixel[2]);
-        }
-        srcRow += srcBytesPerRow;
-    }
-
-    // If we used a temporary then write it to the device
-    if (temporaryBitmap)
-        dstDevice->writePixels(destBitmap, destX, destY);
+    SkBitmap srcBitmap;
+    srcBitmap.setConfig(SkBitmap::kARGB_8888_Config, numColumns, numRows, srcBytesPerRow);
+    srcBitmap.setPixels(source->data() + originY * srcBytesPerRow + originX * 4);
+
+    SkCanvas::Config8888 config8888;
+    if (multiplied == Premultiplied)
+        config8888 = SkCanvas::kRGBA_Premul_Config8888;
+    else
+        config8888 = SkCanvas::kRGBA_Unpremul_Config8888;
+
+    canvas->writePixels(srcBitmap, destX, destY, config8888);
 }
 
 void ImageBuffer::putUnmultipliedImageData(ByteArray* source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint)
 {
-    putImageData<Unmultiplied>(source, sourceSize, sourceRect, destPoint, context()->platformContext()->canvas()->getDevice(), m_size);
+    putImageData<Unmultiplied>(source, sourceSize, sourceRect, destPoint, context()->platformContext()->canvas(), m_size);
 }
 
 void ImageBuffer::putPremultipliedImageData(ByteArray* source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint)
 {
-    putImageData<Premultiplied>(source, sourceSize, sourceRect, destPoint, context()->platformContext()->canvas()->getDevice(), m_size);
+    putImageData<Premultiplied>(source, sourceSize, sourceRect, destPoint, context()->platformContext()->canvas(), m_size);
 }