SkColorType instead of (deprecated) SkBitmap::Config

cc/layers/heads_up_display_layer_impl.cc

Index: cc/layers/heads_up_display_layer_impl.cc
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index 9c544f34c8800f2062b847d7b91cc2b0298e3dbd..b53e8d8bfc452078c4bc5b7105e9106280fdaca0 100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -170,13 +170,14 @@ void HeadsUpDisplayLayerImpl::UpdateHudTexture(
   }
 
   TRACE_EVENT0("cc", "UploadHudTexture");
-  const SkBitmap* bitmap = &hud_canvas_->getDevice()->accessBitmap(false);
-  SkAutoLockPixels locker(*bitmap);

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

Are these locks not needed anymore?

+  SkImageInfo info;
+  size_t rowBytes;
+  const void* pixels = hud_canvas_->peekPixels(&info, &rowBytes);

[Stephen White, 2014/03/18 20:14:07]

It looks like peekPixels() can return NULL in some cases. Should be be checking
for that here?

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

Done.

 
   gfx::Rect content_rect(content_bounds());
-  DCHECK(bitmap->config() == SkBitmap::kARGB_8888_Config);
+  DCHECK(info.colorType() == kPMColor_SkColorType);
   resource_provider->SetPixels(hud_resource_->id(),
-                               static_cast<const uint8_t*>(bitmap->getPixels()),
+                               static_cast<const uint8_t*>(pixels),
                                content_rect,
                                content_rect,
                                gfx::Vector2d());