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

tests/BitmapCopyTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "TestClassDef.h"
 #include "SkBitmap.h"
@@ skipping 340 matching lines @@
                 reporter->reportFailed(str);
             }
             bool sizeFail = false;
             // Compare against hand-computed values.
             switch (gPairs[i].fConfig) {
                 case SkBitmap::kNo_Config:
                     break;
 
                 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:
                     break;
             }
             if (sizeFail) {
                 SkString str;
                 str.printf("getSafeSize64() wrong size: %s",
                     getSkConfigName(tstSafeSize));
                 reporter->reportFailed(str);
@@ skipping 157 matching lines @@
                 // for the transfer.
                 REPORTER_ASSERT(reporter,
                     subset.copyPixelsFrom(buf, 1, subset.rowBytes()) ==
                         false);
 
 #endif
             }
         } // for (size_t copyCase ...
     }
 }