Changeset 90831 in webkit

Timestamp:

Jul 12, 2011 11:31:53 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[skia] optimize getImageData to avoid a copy when not needed. lockPixels() now does the right thing.
​https://bugs.webkit.org/show_bug.cgi?id=64302

Patch by Mike Reed <​reed@google.com> on 2011-07-12
Reviewed by Stephen White.

No new tests. Just an optimization for getImageData(), existing <canvas> tests apply

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::getImageData):
(WebCore::putImageData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-12  Mike Reed  <reed@google.com>
+
+        [skia] optimize getImageData to avoid a copy when not needed. lockPixels() now does the right thing.
+        https://bugs.webkit.org/show_bug.cgi?id=64302
+
+        Reviewed by Stephen White.
+
+        No new tests. Just an optimization for getImageData(), existing <canvas> tests apply
+
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::getImageData):
+        (WebCore::putImageData):
+
 2011-07-12  Pavel Feldman  <pfeldman@google.com>
 

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

@@ -224 +224 @@
 
     SkBitmap srcBitmap;
-    srcDevice.readPixels(SkIRect::MakeXYWH(originX, originY, numColumns, numRows), &srcBitmap);
+    SkIRect srcRect = SkIRect::MakeXYWH(originX, originY, numColumns, numRows);
+    if (!srcDevice.accessBitmap(false).extractSubset(&srcBitmap, srcRect))
+        return result.release();
+    SkAutoLockPixels alp(srcBitmap);
 
     unsigned char* destRow = data + destY * destBytesPerRow + destX * 4;
@@ -299 +302 @@
     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();
+    const SkBitmap& deviceBitmap = dstDevice->accessBitmap(true);
+    bool temporaryBitmap = !deviceBitmap.lockPixelsAreWritable();
     SkBitmap destBitmap;