rename SkBitmapChecksummer as SkBitmapHasher, and prepare for it to possibly use

tests/ChecksumTest.cpp

 
 /*
  * Copyright 2012 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 "SkBitmap.h"
-#include "SkBitmapChecksummer.h"
 #include "SkChecksum.h"
 #include "SkCityHash.h"
-#include "SkColor.h"
 
 // Word size that is large enough to hold results of any checksum type.
 typedef uint64_t checksum_result;
 
 namespace skiatest {
     class ChecksumTestClass : public Test {
     public:
         static Test* Factory(void*) {return SkNEW(ChecksumTestClass); }
     protected:
         virtual void onGetName(SkString* name) { name->set("Checksum"); }
@@ skipping 75 matching lines @@
             SkAutoMalloc storage(len);
             char* start = reinterpret_cast<char *>(storage.get());
             char* ptr = start;
             for (size_t i = 0; i < len; ++i) {
                 *ptr++ = ((seed+i) & 0x7f);
             }
             checksum_result result = ComputeChecksum(start, len);
             return result;
         }
 
-        // Fill in bitmap with test data.
-        void CreateTestBitmap(SkBitmap &bitmap, SkBitmap::Config config, int width, int height,
-                              SkColor color) {
-            bitmap.setConfig(config, width, height);
-            REPORTER_ASSERT(fReporter, bitmap.allocPixels());
-            bitmap.setIsOpaque(true);
-            bitmap.eraseColor(color);
-        }
-
         void RunTest() {
             // Test self-consistency of checksum algorithms.
             fWhichAlgorithm = kSkChecksum;
             TestChecksumSelfConsistency(128);
             fWhichAlgorithm = kSkCityHash32;
             TestChecksumSelfConsistency(128);
             fWhichAlgorithm = kSkCityHash64;
             TestChecksumSelfConsistency(128);
 
             // Test checksum results that should be consistent across
@@ skipping 20 matching lines @@
             // TODO: note the weakness exposed by these collisions...
             // We need to improve the SkChecksum algorithm.
             // We would prefer that these asserts FAIL!
             // Filed as https://code.google.com/p/skia/issues/detail?id=981
             // ('SkChecksum algorithm allows for way too many collisions')
             fWhichAlgorithm = kSkChecksum;
             REPORTER_ASSERT(fReporter,
                 GetTestDataChecksum(128) == GetTestDataChecksum(256));
             REPORTER_ASSERT(fReporter,
                 GetTestDataChecksum(132) == GetTestDataChecksum(260));
-
-            // Test SkBitmapChecksummer
-            SkBitmap bitmap;
-            // initial test case
-            CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 333, 555, SK_ColorBLUE);
-            REPORTER_ASSERT(fReporter,
-                            SkBitmapChecksummer::Compute64(bitmap) == 0x18f9df68b1b02f38ULL);
-            // same pixel data but different dimensions should yield a different checksum
-            CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorBLUE);
-            REPORTER_ASSERT(fReporter,
-                            SkBitmapChecksummer::Compute64(bitmap) == 0x6b0298183f786c8eULL);
-            // same dimensions but different color should yield a different checksum
-            CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorGREEN);
-            REPORTER_ASSERT(fReporter,
-                            SkBitmapChecksummer::Compute64(bitmap) == 0xc6b4b3f6fadaaf37ULL);
-            // same pixel colors in a different config should yield the same checksum
-            CreateTestBitmap(bitmap, SkBitmap::kARGB_4444_Config, 555, 333, SK_ColorGREEN);
-            REPORTER_ASSERT(fReporter,
-                            SkBitmapChecksummer::Compute64(bitmap) == 0xc6b4b3f6fadaaf37ULL);
         }
 
         Reporter* fReporter;
         Algorithm fWhichAlgorithm;
     };
 
     static TestRegistry gReg(ChecksumTestClass::Factory);
 }