commit 01c41a556e0ef0ae2338a1b5ae110a501e1ed0a8
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 20 14:24:21 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 20 14:24:21 2013 +0000
tree 161c3eeed7af2413719cd04c5cb9a627ffcc2537
parent 5f2fd5dd5d6dbf3057258d652aacfc9d664132a2

Revert "Revert "begin to remove SkLONGLONG and wean Skia off of Sk64""

This reverts commit 15b986baf026a3da5e2cac8106a1b753df242c39.

BUG=

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

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

tests/BitmapCopyTest.cpp

diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 0df8c06..7a1d9ac 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -358,22 +358,22 @@
 
                 case SkBitmap::kA8_Config:
                 case SkBitmap::kIndex8_Config:
-                    if (safeSize.fHi != 0x2386F2 ||
-                        safeSize.fLo != 0x6FC10000)
+                    if (safeSize.as64() != 0x2386F26FC10000LL) {
                         sizeFail = true;
+                    }
                     break;
 
                 case SkBitmap::kRGB_565_Config:
                 case SkBitmap::kARGB_4444_Config:
-                    if (safeSize.fHi != 0x470DE4 ||
-                        safeSize.fLo != 0xDF820000)
+                    if (safeSize.as64() != 0x470DE4DF820000LL) {
                         sizeFail = true;
+                    }
                     break;
 
                 case SkBitmap::kARGB_8888_Config:
-                    if (safeSize.fHi != 0x8E1BC9 ||
-                        safeSize.fLo != 0xBF040000)
+                    if (safeSize.as64() != 0x8E1BC9BF040000LL) {
                         sizeFail = true;
+                    }
                     break;
 
                 default: