Revert of 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 107 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_;
-  skia::RefPtr<SkSurface> hud_surface_;
+  scoped_ptr<SkCanvas> hud_canvas_;
+
+  skia::RefPtr<SkTypeface> typeface_;
 
   float internal_contents_scale_;
   gfx::Size internal_content_bounds_;
 
   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_