Title: [90645] trunk/Source/WebCore
- Revision
- 90645
- Author
- [email protected]
- Date
- 2011-07-08 11:13:47 -0700 (Fri, 08 Jul 2011)
Log Message
[skia] don't rely on lockPixels failure to detect gpu-backed device (in prep for skia roll)
https://bugs.webkit.org/show_bug.cgi?id=64162
Patch by Mike Reed <[email protected]> on 2011-07-08
Reviewed by Stephen White.
No new tests. preparing for skia roll, where lockPixels always succeeds (but slowly for gpu-backed)
* platform/graphics/skia/ImageBufferSkia.cpp:
(WebCore::putImageData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90644 => 90645)
--- trunk/Source/WebCore/ChangeLog 2011-07-08 18:06:20 UTC (rev 90644)
+++ trunk/Source/WebCore/ChangeLog 2011-07-08 18:13:47 UTC (rev 90645)
@@ -1,3 +1,15 @@
+2011-07-08 Mike Reed <[email protected]>
+
+ [skia] don't rely on lockPixels failure to detect gpu-backed device (in prep for skia roll)
+ https://bugs.webkit.org/show_bug.cgi?id=64162
+
+ Reviewed by Stephen White.
+
+ No new tests. preparing for skia roll, where lockPixels always succeeds (but slowly for gpu-backed)
+
+ * platform/graphics/skia/ImageBufferSkia.cpp:
+ (WebCore::putImageData):
+
2011-07-08 Chang Shu <[email protected]>
Update calling sites after function renamed.
Modified: trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp (90644 => 90645)
--- trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp 2011-07-08 18:06:20 UTC (rev 90644)
+++ trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp 2011-07-08 18:13:47 UTC (rev 90645)
@@ -299,10 +299,9 @@
unsigned srcBytesPerRow = 4 * sourceSize.width();
SkBitmap deviceBitmap = dstDevice->accessBitmap(true);
- SkAutoLockPixels deviceAutoLock(deviceBitmap);
// If the device's bitmap doesn't have pixels we will make a temp and call writePixels on the device.
- bool temporaryBitmap = !deviceBitmap.getPixels();
+ bool temporaryBitmap = !!deviceBitmap.getTexture();
SkBitmap destBitmap;
if (temporaryBitmap) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
