SkColorType instead of (deprecated) SkBitmap::Config

cc/trees/layer_tree_host_pixeltest_readback.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 "build/build_config.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
@@ skipping 1091 matching lines @@
     EXPECT_EQ(device_scale_factor_, layer_tree_host()->device_scale_factor());
     if (TestEnded())
       return;
 
     gfx::Rect device_viewport_copy_rect(
         layer_tree_host()->device_viewport_size());
     if (!device_viewport_copy_subrect_.IsEmpty())
       device_viewport_copy_rect.Intersect(device_viewport_copy_subrect_);
 
     scoped_ptr<SkBitmap> bitmap(new SkBitmap);
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                      device_viewport_copy_rect.width(),
-                      device_viewport_copy_rect.height());
-    bitmap->allocPixels();
-    {
-      scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap));

[danakj, 2014/03/25 16:13:59]

So what will unlock the bitmap's pixels, or why don't we need to worry about
that anymore?

[reed1, 2014/03/25 17:19:41]

allocPixels() guarantees to lock the pixels automatically. That behavior is not
new, so I am just removing unnecessary code.

[danakj, 2014/03/25 17:31:29]

Ya, I wasn't aware of that before, but doing a scoped lock would have unlocked
the pixels. Do we need to worry about leaving the pixels locked indefinitely, is
what I am wondering?

[reed1, 2014/03/25 17:35:53]

For non-lazy bitmaps (as when they are the target for drawing like this),
staying locked all the time is fine, and basically the norm.

The old code performed a lock/unlock pair, so it was also leaving the bitmap
locked (net), since it started out locked.

-      layer_tree_host()->CompositeAndReadback(bitmap->getPixels(),
-                                              device_viewport_copy_rect);
-    }
+    bitmap->allocN32Pixels(device_viewport_copy_rect.width(),
+                           device_viewport_copy_rect.height());
+    layer_tree_host()->CompositeAndReadback(bitmap->getPixels(),
+                                            device_viewport_copy_rect);
 
     result_bitmap_ = bitmap.Pass();
     EndTest();
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     LayerImpl* root_impl = host_impl->active_tree()->root_layer();
 
     LayerImpl* background_impl = root_impl->children()[0];
     EXPECT_EQ(device_scale_factor_, background_impl->contents_scale_x());
@@ skipping 162 matching lines @@
                                  background,
                                  green.get(),
                                  base::FilePath(FILE_PATH_LITERAL(
                                      "green_with_blue_corner.png")));
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // OS_ANDROID