Hide fields in SkImageInfo
R=rmistry@google.com
TBR=bsalomon
Author: reed@google.com
Review URL: https://codereview.chromium.org/536003002
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index 986994a..167f773 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -41,7 +41,7 @@
static const size_t kMaxTotalSize = SK_MaxS32;
int shift = 0;
- switch (info.fColorType) {
+ switch (info.colorType()) {
case kAlpha_8_SkColorType:
shift = 0;
break;
@@ -59,7 +59,7 @@
return true;
}
- uint64_t minRB = (uint64_t)info.fWidth << shift;
+ uint64_t minRB = (uint64_t)info.width() << shift;
if (minRB > rowBytes) {
return false;
}
@@ -69,7 +69,7 @@
return false;
}
- uint64_t size = sk_64_mul(info.fHeight, rowBytes);
+ uint64_t size = sk_64_mul(info.height(), rowBytes);
if (size > kMaxTotalSize) {
return false;
}
@@ -86,7 +86,7 @@
}
SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr)
- : INHERITED(pr->info().fWidth, pr->info().fHeight)
+ : INHERITED(pr->info().width(), pr->info().height())
{
const SkImageInfo& info = pr->info();