Fixes for two different HUD issues related to win32k lockdown

cc/layers/heads_up_display_layer_impl.h

Index: cc/layers/heads_up_display_layer_impl.h
diff --git a/cc/layers/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h
index 3e9436badf3a4b7480cb01fe8975392341c4f61c..e52857e0c16b6c631af83a78a5d83700a7354674 100644
--- a/cc/layers/heads_up_display_layer_impl.h
+++ b/cc/layers/heads_up_display_layer_impl.h
@@ -29,8 +29,10 @@ class PaintTimeCounter;
 class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
  public:
   static scoped_ptr<HeadsUpDisplayLayerImpl> Create(LayerTreeImpl* tree_impl,
-                                                    int id) {
-    return make_scoped_ptr(new HeadsUpDisplayLayerImpl(tree_impl, id));
+                                                    int id,
+                                                    SkTypeface* typeface) {
+    return make_scoped_ptr(
+        new HeadsUpDisplayLayerImpl(tree_impl, id, typeface));
   }
   ~HeadsUpDisplayLayerImpl() override;
 
@@ -67,7 +69,9 @@ class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
     const double indicator;
   };
 
-  HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl, int id);
+  HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl,
+                          int id,
+                          SkTypeface* typeface);
 
   const char* LayerTypeAsString() const override;
 
@@ -126,9 +130,10 @@ class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
   void ReleaseUnmatchedSizeResources(ResourceProvider* resource_provider);
 
   ScopedPtrVector<ScopedResource> resources_;
-  scoped_ptr<SkCanvas> hud_canvas_;
+  skia::RefPtr<SkSurface> hud_surface_;
+  SkCanvas* hud_canvas_;

[enne (OOO), 2015/02/05 01:30:28]

Can you make this a RefPtr or just access it off the surface when you need it,
rather than having a raw pointer member variable?

[scottmg, 2015/02/05 03:28:32]

Done.

 
-  skia::RefPtr<SkTypeface> typeface_;
+  SkTypeface* typeface_;

[enne (OOO), 2015/02/05 01:30:28]

Can this be a skia::RefPtr all the way through the plumbing? For this browser
compositor case, I think this won't break, but cc has other embedders, so this
seems like a use-after-free waiting to happen.

[scottmg, 2015/02/05 03:28:32]

I did the Windows one first where it's leaked early so weak seemed OK. Done.

 
   Graph fps_graph_;
   Graph paint_time_graph_;