Convert CC HUD from GDI bitmap to SkSurface

cc/layers/heads_up_display_layer_impl.cc

 // Copyright 2012 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/layers/heads_up_display_layer_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/stringprintf.h"
@@ skipping 161 matching lines @@
                nearest_neighbor);
 }
 
 void HeadsUpDisplayLayerImpl::UpdateHudTexture(
     DrawMode draw_mode,
     ResourceProvider* resource_provider) {
   if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE || !resources_.back()->id())
     return;
 
   SkISize canvas_size;
-  if (hud_canvas_)
-    canvas_size = hud_canvas_->getDeviceSize();
+  if (hud_surface_)
+    canvas_size = hud_surface_->getCanvas()->getDeviceSize();
   else
     canvas_size.set(0, 0);
 
   if (canvas_size.width() != internal_content_bounds_.width() ||
       canvas_size.height() != internal_content_bounds_.height() ||
-      !hud_canvas_) {
+      !hud_surface_) {
     TRACE_EVENT0("cc", "ResizeHudCanvas");
 
-    bool opaque = false;
-    hud_canvas_ = make_scoped_ptr(
-        skia::CreateBitmapCanvas(internal_content_bounds_.width(),
-                                 internal_content_bounds_.height(), opaque));
+    hud_surface_ = skia::AdoptRef(SkSurface::NewRasterN32Premul(
+        internal_content_bounds_.width(), internal_content_bounds_.height()));
   }
 
   UpdateHudContents();
 
   {
     TRACE_EVENT0("cc", "DrawHudContents");
-    hud_canvas_->clear(SkColorSetARGB(0, 0, 0, 0));
-    hud_canvas_->save();
-    hud_canvas_->scale(internal_contents_scale_, internal_contents_scale_);
+    hud_surface_->getCanvas()->clear(SkColorSetARGB(0, 0, 0, 0));
+    hud_surface_->getCanvas()->save();
+    hud_surface_->getCanvas()->scale(internal_contents_scale_,
+                                     internal_contents_scale_);
 
-    DrawHudContents(hud_canvas_.get());
+    DrawHudContents(hud_surface_->getCanvas());
 
-    hud_canvas_->restore();
+    hud_surface_->getCanvas()->restore();
   }
 
   TRACE_EVENT0("cc", "UploadHudTexture");
   SkImageInfo info;
   size_t row_bytes = 0;
-  const void* pixels = hud_canvas_->peekPixels(&info, &row_bytes);
+  const void* pixels = hud_surface_->getCanvas()->peekPixels(&info, &row_bytes);
   DCHECK(pixels);
   DCHECK(info.colorType() == kN32_SkColorType);
   resource_provider->CopyToResource(resources_.back()->id(),
                                     static_cast<const uint8_t*>(pixels),
                                     internal_content_bounds_);
 }
 
 void HeadsUpDisplayLayerImpl::ReleaseResources() {
   resources_.clear();
 }
@@ skipping 610 matching lines @@
   return "cc::HeadsUpDisplayLayerImpl";
 }
 
 void HeadsUpDisplayLayerImpl::AsValueInto(
     base::trace_event::TracedValue* dict) const {
   LayerImpl::AsValueInto(dict);
   dict->SetString("layer_name", "Heads Up Display Layer");
 }
 
 }  // namespace cc