Fixes for two different HUD issues related to win32k lockdown

cc/layers/heads_up_display_layer_impl.h

 // 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.
 
 #ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 #define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
 struct SkRect;
 
 namespace cc {
 
 class FrameRateCounter;
 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;
 
   scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
 
   bool WillDraw(DrawMode draw_mode,
                 ResourceProvider* resource_provider) override;
   void AppendQuads(RenderPass* render_pass,
                    const Occlusion& occlusion_in_content_space,
                    AppendQuadsData* append_quads_data) override;
@@ skipping 16 matching lines @@
 
     double value;
     double min;
     double max;
 
     double current_upper_bound;
     const double default_upper_bound;
     const double indicator;
   };
 
-  HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl, int id);
+  HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl,
+                          int id,
+                          SkTypeface* typeface);
 
   const char* LayerTypeAsString() const override;
 
   void AsValueInto(base::debug::TracedValue* dict) const override;
 
   void UpdateHudContents();
   void DrawHudContents(SkCanvas* canvas);
 
   void DrawText(SkCanvas* canvas,
                 SkPaint* paint,
@@ skipping 38 matching lines @@
                      SkColor stroke_color,
                      SkColor fill_color,
                      float stroke_width,
                      const std::string& label_text) const;
   void DrawDebugRects(SkCanvas* canvas, DebugRectHistory* debug_rect_history);
 
   void AcquireResource(ResourceProvider* resource_provider);
   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_;
   MemoryHistory::Entry memory_entry_;
   int fade_step_;
   std::vector<DebugRect> paint_rects_;
 
   base::TimeTicks time_of_last_graph_update_;
 
   DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_