diff options
author | Matt Sarett <msarett@google.com> | 2017-04-28 15:43:35 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-28 20:14:55 +0000 |
commit | a6e976aac8eaaacc2f802ac8f65b056e5b78e249 (patch) | |
tree | 1f32ae32d93aed8d048eb515b2d3135807e0dab6 /src/image/SkImage_Raster.cpp | |
parent | dc87c95382d5beab7fdae2e654d6de568fbe1671 (diff) |
Only store width and height on SkPixelRef (part 1)
Relanding https://skia-review.googlesource.com/c/14105/
in pieces to try to diagnose problems with the Chrome
roll.
Bug: skia:6535
Change-Id: Ic321c437ecd3cb7940a48fd73fc22b192804c67a
Reviewed-on: https://skia-review.googlesource.com/14650
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/image/SkImage_Raster.cpp')
-rw-r--r-- | src/image/SkImage_Raster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index 91de4c5b0b..88847551d1 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -28,7 +28,7 @@ // fixes https://bug.skia.org/5096 static bool is_not_subset(const SkBitmap& bm) { SkASSERT(bm.pixelRef()); - SkISize dim = bm.pixelRef()->info().dimensions(); + SkISize dim = SkISize::Make(bm.pixelRef()->width(), bm.pixelRef()->height()); SkASSERT(dim != bm.dimensions() || bm.pixelRefOrigin().isZero()); return dim == bm.dimensions(); } |