commit 6f3795105b2b458079e53a721c1735c9518f6bb5
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 16 20:36:03 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 16 20:36:03 2011 +0000
tree 107d2ec0b8986a3bf96220fe9e86974fe9f7b8e3
parent aa336da0838c3da8b3be2e0348da3c6abeebf273

Make all pixel ops go thru ctx so we can correctly flush. Unify two texture upload code paths. 

Review URL: http://codereview.appspot.com/5373108/



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

src/gpu/SkGrTexturePixelRef.cpp

diff --git a/src/gpu/SkGrTexturePixelRef.cpp b/src/gpu/SkGrTexturePixelRef.cpp
index 140993a..8d0eb89 100644
--- a/src/gpu/SkGrTexturePixelRef.cpp
+++ b/src/gpu/SkGrTexturePixelRef.cpp
@@ -79,7 +79,7 @@
         void* buffer = dst->getPixels();
         return fTexture->readPixels(left, top, width, height,
                                     kSkia8888_PM_GrPixelConfig,
-                                    buffer);
+                                    buffer, dst->rowBytes());
     } else {
         return false;
     }
@@ -123,7 +123,7 @@
         void* buffer = dst->getPixels();
         return fRenderTarget->readPixels(left, top, width, height,
                                          kSkia8888_PM_GrPixelConfig,
-                                         buffer);
+                                         buffer, dst->rowBytes());
     } else {
         return false;
     }