hide SkBitmap::Config entirely (behind a flag)

tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDifferentPixelsMetric.h"
 
 #include "SkBitmap.h"
 #include "skpdiff_util.h"
 
 const char* SkDifferentPixelsMetric::getName() const {
     return "different_pixels";
 }
 
 bool SkDifferentPixelsMetric::diff(SkBitmap* baseline, SkBitmap* test, bool computeMask,
                                    Result* result) const {
     double startTime = get_seconds();
 
     // Ensure the images are comparable
     if (baseline->width() != test->width() || baseline->height() != test->height() ||
         baseline->width() <= 0 || baseline->height() <= 0 ||
-        baseline->config() != test->config()) {
+        baseline->colorType() != test->colorType()) {
         return false;
     }
 
     int width = baseline->width();
     int height = baseline->height();
 
     // Prepare the POI alpha mask if needed
     if (computeMask) {
         result->poiAlphaMask.allocPixels(SkImageInfo::MakeA8(width, height));
         result->poiAlphaMask.eraseARGB(SK_AlphaOPAQUE, 0, 0, 0);
@@ skipping 23 matching lines @@
     if (computeMask) {
         result->poiAlphaMask.unlockPixels();
     }
 
     // Calculates the percentage of identical pixels
     result->result = 1.0 - ((double)result->poiCount / (width * height));
     result->timeElapsed = get_seconds() - startTime;
 
     return true;
 }