Changeset 106477 in webkit

Timestamp:

Feb 1, 2012 11:21:32 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[SKIA/CHROMIUM] Perform getImageData format conversions using Skia
​https://bugs.webkit.org/show_bug.cgi?id=77553

Patch by Brian Salomon <​bsalomon@google.com> on 2012-02-01
Reviewed by Stephen White.

Source/WebCore:

Many existing canvas tests exercise this functionality.

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::getImageData):

LayoutTests:

• platform/chromium/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-01  Brian Salomon  <bsalomon@google.com>
+
+        [SKIA/CHROMIUM] Perform getImageData format conversions using Skia
+        https://bugs.webkit.org/show_bug.cgi?id=77553
+
+        Reviewed by Stephen White.
+
+        * platform/chromium/test_expectations.txt:
+
 2012-02-01  Nate Chapin  <japhet@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2380 +2380 @@
 BUGWK52509 LINUX WIN : svg/css/rect-gradient-stroke-shadow.svg = IMAGE
 BUGWK52509 LEOPARD : svg/css/rect-gradient-stroke-shadow.svg = IMAGE
-BUGCR63921 LINUX WIN CPU : fast/canvas/canvas-fillPath-shadow.html = TEXT
+BUGCR63921 LINUX WIN : fast/canvas/canvas-fillPath-shadow.html = TEXT
 
 // Mainly flaky with mac debug, but also intermittent crashes seen on linux and windows
@@ -2592 +2592 @@
 //
 
-// 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
+// Combination of unpremul plus gradient computation at half-integer coords causes
+// this to fail.
+BUGWK77550 GPU : canvas/philip/tests/2d.gradient.interpolate.colouralpha.html = TEXT
 
 // These will have slight differences on the edges of antialiased paths and need rebaseling

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-01  Brian Salomon  <bsalomon@google.com>
+
+        [SKIA/CHROMIUM] Perform getImageData format conversions using Skia
+        https://bugs.webkit.org/show_bug.cgi?id=77553
+
+        Reviewed by Stephen White.
+
+        Many existing canvas tests exercise this functionality.
+
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::getImageData):
+
 2012-02-01  Nate Chapin  <japhet@chromium.org>
 

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

@@ -227 +227 @@
         memset(data, 0, result->length());
 
-    int originX = rect.x();
-    int destX = 0;
-    if (originX < 0) {
-        destX = -originX;
-        originX = 0;
-    }
-    int endX = rect.maxX();
-    if (endX > size.width())
-        endX = size.width();
-    int numColumns = endX - originX;
-
-    if (numColumns <= 0)
-        return result.release();
-
-    int originY = rect.y();
-    int destY = 0;
-    if (originY < 0) {
-        destY = -originY;
-        originY = 0;
-    }
-    int endY = rect.maxY();
-    if (endY > size.height())
-        endY = size.height();
-    int numRows = endY - originY;
-
-    if (numRows <= 0)
-        return result.release();
-
-    SkBitmap srcBitmap;
-    if (!canvas->readPixels(SkIRect::MakeXYWH(originX, originY, numColumns, numRows), &srcBitmap))
-        return result.release();
-
     unsigned destBytesPerRow = 4 * rect.width();
-    unsigned char* destRow = data + destY * destBytesPerRow + destX * 4;
-
-    // Do conversion of byte order and alpha divide (if necessary)
-    for (int y = 0; y < numRows; ++y) {
-        SkPMColor* srcBitmapRow = srcBitmap.getAddr32(0, y);
-        for (int x = 0; x < numColumns; ++x) {
-            SkPMColor srcPMColor = srcBitmapRow[x];
-            unsigned char* destPixel = &destRow[x * 4];
-            if (multiplied == Unmultiplied) {
-                unsigned char a = SkGetPackedA32(srcPMColor);
-                destPixel[0] = a ? SkGetPackedR32(srcPMColor) * 255 / a : 0;
-                destPixel[1] = a ? SkGetPackedG32(srcPMColor) * 255 / a : 0;
-                destPixel[2] = a ? SkGetPackedB32(srcPMColor) * 255 / a : 0;
-                destPixel[3] = a;
-            } else {
-                // Input and output are both pre-multiplied, we just need to re-arrange the
-                // bytes from the bitmap format to RGBA.
-                destPixel[0] = SkGetPackedR32(srcPMColor);
-                destPixel[1] = SkGetPackedG32(srcPMColor);
-                destPixel[2] = SkGetPackedB32(srcPMColor);
-                destPixel[3] = SkGetPackedA32(srcPMColor);
-            }
-        }
-        destRow += destBytesPerRow;
-    }
-
+    SkBitmap destBitmap;
+    destBitmap.setConfig(SkBitmap::kARGB_8888_Config, rect.width(), rect.height(), destBytesPerRow);
+    destBitmap.setPixels(data);
+
+    SkCanvas::Config8888 config8888;
+    if (multiplied == Premultiplied)
+        config8888 = SkCanvas::kRGBA_Premul_Config8888;
+    else
+        config8888 = SkCanvas::kRGBA_Unpremul_Config8888;
+
+    canvas->readPixels(&destBitmap, rect.x(), rect.y(), config8888);
     return result.release();
 }