SkColorType instead of (deprecated) SkBitmap::Config

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 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 "cc/test/layer_tree_pixel_test.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "cc/base/switches.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 250 matching lines @@
                  size.width(),
                  size.height(),
                  GL_RGBA,
                  GL_UNSIGNED_BYTE,
                  pixels.get());
 
   gl->DeleteFramebuffers(1, &fbo);
   gl->DeleteTextures(1, &texture_id);
 
   scoped_ptr<SkBitmap> bitmap(new SkBitmap);
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                    size.width(),
-                    size.height());
-  bitmap->allocPixels();
+  bitmap->allocN32Pixels(size.width(), size.height());
 
-  scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap));
   uint8* out_pixels = static_cast<uint8*>(bitmap->getPixels());
 
   size_t row_bytes = size.width() * 4;
   size_t total_bytes = size.height() * row_bytes;
   for (size_t dest_y = 0; dest_y < total_bytes; dest_y += row_bytes) {
     // Flip Y axis.
     size_t src_y = total_bytes - dest_y - row_bytes;
     // Swizzle OpenGL -> Skia byte order.
     for (size_t x = 0; x < row_bytes; x += 4) {
       out_pixels[dest_y + x + SK_R32_SHIFT/8] = pixels.get()[src_y + x + 0];
@@ skipping 30 matching lines @@
   GLES2Interface* gl = context->GetImplementation();
 
   GLuint texture_id = 0;
   gl->GenTextures(1, &texture_id);
   gl->BindTexture(GL_TEXTURE_2D, texture_id);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-  DCHECK_EQ(SkBitmap::kARGB_8888_Config, bitmap.getConfig());
+  DCHECK_EQ(kPMColor_SkColorType, bitmap.colorType());

[enne (OOO), 2014/03/18 19:43:03]

Is this the same check?

[reed1, 2014/03/21 20:49:01]

Yes. In SkColorType world, we now have two explicit swizzles named: kRGBA and
kBGRA. kPMColor is an alias for which ever one corresponds to the default for
skia's backend (which is exactly what kARGB_8888_Config was used for).

In the future, when we fully support both swizzles (at least on input), the
caller for this may want to pick either, and then we should relax this assert
AND update the swizzle code below.

My change was to just maintain parity with the existing functionality.

 
   {
     SkAutoLockPixels lock(bitmap);
 
     size_t row_bytes = bitmap.width() * 4;
     size_t total_bytes = bitmap.height() * row_bytes;
 
     scoped_ptr<uint8[]> gl_pixels(new uint8[total_bytes]);
     uint8* bitmap_pixels = static_cast<uint8*>(bitmap.getPixels());
 
@@ skipping 28 matching lines @@
 
   *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point);
   *release_callback = SingleReleaseCallback::Create(
       base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox,
                  base::Unretained(this),
                  base::Passed(&context),
                  texture_id));
 }
 
 }  // namespace cc