Fixes for two different HUD issues related to win32k lockdown

cc/layers/heads_up_display_layer.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.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
 
-scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create() {
-  return make_scoped_refptr(new HeadsUpDisplayLayer());
+scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create(
+    SkTypeface* typeface) {
+  return make_scoped_refptr(new HeadsUpDisplayLayer(typeface));
 }
 
-HeadsUpDisplayLayer::HeadsUpDisplayLayer() {
+HeadsUpDisplayLayer::HeadsUpDisplayLayer(SkTypeface* typeface)
+    : typeface_(typeface) {
   SetIsDrawable(true);
   UpdateDrawsContent(HasDrawableContent());
 }
 
 HeadsUpDisplayLayer::~HeadsUpDisplayLayer() {}
 
 void HeadsUpDisplayLayer::PrepareForCalculateDrawProperties(
     const gfx::Size& device_viewport, float device_scale_factor) {
   gfx::Size device_viewport_in_layout_pixels = gfx::Size(
       device_viewport.width() / device_scale_factor,
@@ skipping 19 matching lines @@
   SetBounds(bounds);
   SetTransform(matrix);
 }
 
 bool HeadsUpDisplayLayer::HasDrawableContent() const {
   return true;
 }
 
 scoped_ptr<LayerImpl> HeadsUpDisplayLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
-  return HeadsUpDisplayLayerImpl::Create(tree_impl, layer_id_);
+  return HeadsUpDisplayLayerImpl::Create(tree_impl, layer_id_, typeface_);
 }
 
 }  // namespace cc