commit 303c4758ec7062daf1531c3642e9c7887423ef1b
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 09 20:00:14 2014 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 09 20:00:14 2014 +0000
tree d9cf00355e57c2b2ca13c851931256754388e3d6
parent fe5824af296c5b7e7f3f14e75124712eabea34e2

use bitmap's fRowBytes, as the pixelref's is not (yet) reliable

should fix linux browser_tests for DEPS roll

BUG=
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/132273004

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

src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index cb8ac72..f950e28 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -341,7 +341,7 @@
             void* p = fPixelRef->pixels();
             if (NULL != p) {
                 p = (char*)p
-                    + fPixelRef->rowBytes() * fPixelRefOrigin.fY
+                    + fPixelRefOrigin.fY * fRowBytes
                     + fPixelRefOrigin.fX * fBytesPerPixel;
             }
             fPixels = p;