Revert "Revert of https://codereview.chromium.org/113823003/"
This reverts commit 68b4b32066ea0ba9dbb5d326a836f8a54297b7aa.
BUG=
Review URL: https://codereview.chromium.org/122293002
git-svn-id: http://skia.googlecode.com/svn/trunk@12842 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 7a1d9ac..455fc69 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -343,8 +343,8 @@
SkBitmap tstSafeSize;
tstSafeSize.setConfig(gPairs[i].fConfig, 100000000U,
100000000U);
- Sk64 safeSize = tstSafeSize.getSafeSize64();
- if (safeSize.isNeg()) {
+ int64_t safeSize = tstSafeSize.computeSafeSize64();
+ if (safeSize < 0) {
SkString str;
str.printf("getSafeSize64() negative: %s",
getSkConfigName(tstSafeSize));
@@ -358,20 +358,20 @@
case SkBitmap::kA8_Config:
case SkBitmap::kIndex8_Config:
- if (safeSize.as64() != 0x2386F26FC10000LL) {
+ if (safeSize != 0x2386F26FC10000LL) {
sizeFail = true;
}
break;
case SkBitmap::kRGB_565_Config:
case SkBitmap::kARGB_4444_Config:
- if (safeSize.as64() != 0x470DE4DF820000LL) {
+ if (safeSize != 0x470DE4DF820000LL) {
sizeFail = true;
}
break;
case SkBitmap::kARGB_8888_Config:
- if (safeSize.as64() != 0x8E1BC9BF040000LL) {
+ if (safeSize != 0x8E1BC9BF040000LL) {
sizeFail = true;
}
break;
@@ -381,7 +381,7 @@
}
if (sizeFail) {
SkString str;
- str.printf("getSafeSize64() wrong size: %s",
+ str.printf("computeSafeSize64() wrong size: %s",
getSkConfigName(tstSafeSize));
reporter->reportFailed(str);
}