Borg

git-svn-id: http://skia.googlecode.com/svn/trunk@1077 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 9 insertions, 7 deletions

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 90728b1dda..300ad272de 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -237,13 +237,15 @@ bool SkGpuDevice::readPixels(const SkIRect& srcRect, SkBitmap* bitmap) {
         return false;
     }
 
-    SkAutoLockPixels alp(tmp);
-
-    if (!fContext->readRenderTargetPixels(fRenderTarget,
-                                          bounds.fLeft, bounds.fTop,
-                                          bounds.width(), bounds.height(),
-                                          kRGBA_8888_GrPixelConfig,
-                                          tmp.getPixels())) {
+    tmp.lockPixels();
+
+    bool read = !fContext->readRenderTargetPixels(fRenderTarget,
+                                                  bounds.fLeft, bounds.fTop,
+                                                  bounds.width(), bounds.height(),
+                                                  kRGBA_8888_GrPixelConfig,
+                                                  tmp.getPixels());
+    tmp.unlockPixels();
+    if (!read) {
         return false;
     }