Scrub deprecated Skia APIs.

content/common/gpu/client/gl_helper_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <cmath>
 #include <string>
 #include <vector>
 
 #include <GLES2/gl2.h>
@@ skipping 838 matching lines @@
     ASSERT_GT(grid_pitch, 0);
     ASSERT_GT(grid_width, 0);
     ASSERT_NE(background_color, grid_color);
 
     for (int y = 0; y < h; ++y) {
       bool y_on_grid = ((y % grid_pitch) < grid_width);
 
       for (int x = 0; x < w; ++x) {
         bool on_grid = (y_on_grid || ((x % grid_pitch) < grid_width));
 
-        if (bmp.getConfig() == SkBitmap::kARGB_8888_Config) {
+        if (bmp.config() == SkBitmap::kARGB_8888_Config) {

[reed1, 2014/05/07 18:06:22]

Can we compare using colortypes instead of configs?

           *bmp.getAddr32(x, y) = (on_grid ? grid_color : background_color);
-        } else if (bmp.getConfig() == SkBitmap::kRGB_565_Config) {
+        } else if (bmp.config() == SkBitmap::kRGB_565_Config) {
           *bmp.getAddr16(x, y) = (on_grid ? grid_color : background_color);
         }
       }
     }
   }
 
   void DrawCheckerToBitmap(int w, int h,
                            SkColor color1, SkColor color2,
                            int rect_w, int rect_h,
                            SkBitmap& bmp) {
     ASSERT_GT(rect_w, 0);
     ASSERT_GT(rect_h, 0);
     ASSERT_NE(color1, color2);
 
     for (int y = 0; y < h; ++y) {
       bool y_bit = (((y / rect_h) & 0x1) == 0);
 
       for (int x = 0; x < w; ++x) {
         bool x_bit = (((x / rect_w) & 0x1) == 0);
 
         bool use_color2 = (x_bit != y_bit);  // xor
-        if (bmp.getConfig() == SkBitmap::kARGB_8888_Config) {
+        if (bmp.config() == SkBitmap::kARGB_8888_Config) {
           *bmp.getAddr32(x, y) = (use_color2 ? color2 : color1);
-        } else if (bmp.getConfig() == SkBitmap::kRGB_565_Config) {
+        } else if (bmp.config() == SkBitmap::kRGB_565_Config) {
           *bmp.getAddr16(x, y) = (use_color2 ? color2 : color1);
         }
       }
     }
   }
 
   bool ColorComponentsClose(SkColor component1,
                             SkColor component2,
                             SkBitmap::Config config) {
     int c1 = static_cast<int>(component1);
@@ skipping 28 matching lines @@
   }
 
   bool IsEqual(const SkBitmap& bmp1, const SkBitmap& bmp2) {
     if (bmp1.isNull() && bmp2.isNull())
       return true;
     if (bmp1.width() != bmp2.width() ||
         bmp1.height() != bmp2.height()) {
         LOG(ERROR) << "Bitmap geometry check failure";
         return false;
     }
-    if (bmp1.getConfig() != bmp2.getConfig())
+    if (bmp1.config() != bmp2.config())
       return false;
 
     SkAutoLockPixels lock1(bmp1);
     SkAutoLockPixels lock2(bmp2);
     if (!bmp1.getPixels() || !bmp2.getPixels()) {
       LOG(ERROR) << "Empty Bitmap!";
       return false;
     }
     for (int y = 0; y < bmp1.height(); ++y) {
       for (int x = 0; x < bmp1.width(); ++x) {
         if (!ColorsClose(bmp1.getColor(x,y),
                          bmp2.getColor(x,y),
-                         bmp1.getConfig())) {
+                         bmp1.config())) {
           LOG(ERROR) << "Bitmap color comparision failure";
           return false;
         }
       }
     }
     return true;
   }
 
   void BindAndAttachTextureWithPixels(GLuint src_texture,
                                       SkBitmap::Config bitmap_config,
@@ skipping 708 matching lines @@
   base::TestSuite* suite = new content::ContentTestSuite(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
   gpu::ApplyGpuDriverBugWorkarounds(CommandLine::ForCurrentProcess());
 
   content::UnitTestTestSuite runner(suite);
   base::MessageLoop message_loop;
   return runner.Run();
 }