Revert of Fixes for two different HUD issues related to win32k lockdown

Revert of Fixes for two different HUD issues related to win32k lockdown (patchset #9 id:350001 of https://codereview.chromium.org/900063002/)

Reason for revert:
Causes regression in cold start on Android and maybe Mac.

Details in http://crbug.com/457248.

Original issue's description:
> Fixes for two different HUD issues related to win32k lockdown
> 
> 1. Using a GDI bitmap -- switch to SkSurface instead
> 
> 2. Lazily loading a font. This breaks for two different reasons.
> The first is a DCHECK for doing IO on the Compositor thread. This
> could have been just ignored in general since it's only for debug
> usage, the drawbacks of minor jank are limited.
> 
> However, once lockdown is on, the font load hard fails from the
> renderer. So, load the typeface before lockdown and pass it into
> CC and the hud via LayerTreeSettings.
> 
> R=danakj@chromium.org
> BUG=453731, 455104
> TEST=run chrome with --enable-win32k-renderer-lockdown --show-fps-counter --ui-show-fps-counter on Win8
> 
> Committed: https://crrev.com/616a8e656b2d923ed393bde86adc150e555ba799
> Cr-Commit-Position: refs/heads/master@{#314929}

TBR=enne@chromium.org,danakj@chromium.org,piman@chromium.org
BUG=453731, 455104, 457248
Committed: https://chromium.googlesource.com/chromium/src/+/1793e0467bb34d2545c0493a557bb038cc2ac6f0

[scottmg, 2015-02-23 16:41:15]

Created Revert of Fixes for two different HUD issues related to win32k lockdown

[commit-bot: I haz the power, 2015-02-23 16:42:10]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/922293006/1

[commit-bot: I haz the power, 2015-02-23 16:42:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-23 16:42:48]

Failed to apply patch for cc/layers/heads_up_display_layer_impl.cc:
While running git apply --index -3 -p1;
  error: patch failed: cc/layers/heads_up_display_layer_impl.cc:69
  Falling back to three-way merge...
  Applied patch to 'cc/layers/heads_up_display_layer_impl.cc' with conflicts.
  U cc/layers/heads_up_display_layer_impl.cc

Patch:       cc/layers/heads_up_display_layer_impl.cc
Index: cc/layers/heads_up_display_layer_impl.cc
diff --git a/cc/layers/heads_up_display_layer_impl.cc
b/cc/layers/heads_up_display_layer_impl.cc
index
60d984b004915014ef4a94ac6c83c7529f4114a4..cdb000ffa17a18560359c8729672c9e4fe9dd846
100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -69,10 +69,11 @@
 HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl,
                                                  int id)
     : LayerImpl(tree_impl, id),
+      typeface_(skia::AdoptRef(
+          SkTypeface::CreateFromName("monospace", SkTypeface::kBold))),
       fps_graph_(60.0, 80.0),
       paint_time_graph_(16.0, 48.0),
-      fade_step_(0) {
-}
+      fade_step_(0) {}
 
 HeadsUpDisplayLayerImpl::~HeadsUpDisplayLayerImpl() {}
 
@@ -172,36 +173,36 @@
     return;
 
   SkISize canvas_size;
-  if (hud_surface_)
-    canvas_size = hud_surface_->getCanvas()->getDeviceSize();
+  if (hud_canvas_)
+    canvas_size = hud_canvas_->getDeviceSize();
   else
     canvas_size.set(0, 0);
 
   if (canvas_size.width() != content_bounds().width() ||
-      canvas_size.height() != content_bounds().height() || !hud_surface_) {
+      canvas_size.height() != content_bounds().height() || !hud_canvas_) {
     TRACE_EVENT0("cc", "ResizeHudCanvas");
-
-    hud_surface_ = skia::AdoptRef(SkSurface::NewRasterN32Premul(
-        content_bounds().width(), content_bounds().height()));
+    bool opaque = false;
+    hud_canvas_ = make_scoped_ptr(skia::CreateBitmapCanvas(
+        content_bounds().width(), content_bounds().height(), opaque));
   }
 
   UpdateHudContents();
 
   {
     TRACE_EVENT0("cc", "DrawHudContents");
-    hud_surface_->getCanvas()->clear(SkColorSetARGB(0, 0, 0, 0));
-    hud_surface_->getCanvas()->save();
-    hud_surface_->getCanvas()->scale(contents_scale_x(), contents_scale_y());
-
-    DrawHudContents(hud_surface_->getCanvas());
-
-    hud_surface_->getCanvas()->restore();
+    hud_canvas_->clear(SkColorSetARGB(0, 0, 0, 0));
+    hud_canvas_->save();
+    hud_canvas_->scale(contents_scale_x(), contents_scale_y());
+
+    DrawHudContents(hud_canvas_.get());
+
+    hud_canvas_->restore();
   }
 
   TRACE_EVENT0("cc", "UploadHudTexture");
   SkImageInfo info;
   size_t row_bytes = 0;
-  const void* pixels = hud_surface_->getCanvas()->peekPixels(&info,
&row_bytes);
+  const void* pixels = hud_canvas_->peekPixels(&info, &row_bytes);
   DCHECK(pixels);
   gfx::Rect content_rect(content_bounds());
   DCHECK(info.colorType() == kN32_SkColorType);
@@ -299,7 +300,7 @@
 
   paint->setTextSize(size);
   paint->setTextAlign(align);
-  paint->setTypeface(layer_tree_impl()->settings().hud_typeface.get());
+  paint->setTypeface(typeface_.get());
   canvas->drawText(text.c_str(), text.length(), x, y, *paint);
 
   paint->setAntiAlias(anti_alias);
@@ -705,7 +706,7 @@
 
     SkPaint label_paint = CreatePaint();
     label_paint.setTextSize(kFontHeight);
-    label_paint.setTypeface(layer_tree_impl()->settings().hud_typeface.get());
+    label_paint.setTypeface(typeface_.get());
     label_paint.setColor(stroke_color);
 
     const SkScalar label_text_width =

[commit-bot: I haz the power, 2015-02-23 16:43:01]

The CQ bit was unchecked by commit-bot@chromium.org

[scottmg, 2015-02-23 17:34:14]

The CQ bit was checked by scottmg@chromium.org

[commit-bot: I haz the power, 2015-02-23 17:35:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/922293006/230001

[scottmg, 2015-02-23 18:03:57]

The CQ bit was unchecked by scottmg@chromium.org

[scottmg, 2015-02-23 18:47:28]

The CQ bit was checked by scottmg@chromium.org

[commit-bot: I haz the power, 2015-02-23 18:47:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/922293006/250001

[commit-bot: I haz the power, 2015-02-23 18:51:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-23 18:51:03]

Try jobs failed on following builders:
  ios_dbg_simulator on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)

[scottmg, 2015-02-23 18:55:21]

The CQ bit was checked by scottmg@chromium.org

[commit-bot: I haz the power, 2015-02-23 18:56:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/922293006/250001

[scottmg, 2015-02-23 19:02:47]

The CQ bit was checked by scottmg@chromium.org

[commit-bot: I haz the power, 2015-02-23 19:04:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/922293006/180002

[commit-bot: I haz the power, 2015-02-23 19:07:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-23 19:07:12]

Try jobs failed on following builders:
  ios_dbg_simulator on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)

[scottmg, 2015-02-23 19:23:50]

The CQ bit was checked by scottmg@chromium.org

[commit-bot: I haz the power, 2015-02-23 19:25:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/922293006/270001

[commit-bot: I haz the power, 2015-02-23 19:30:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-23 19:30:03]

Try jobs failed on following builders:
  ios_dbg_simulator on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)

[scottmg, 2015-02-23 19:52:09]

The CQ bit was checked by scottmg@chromium.org

[commit-bot: I haz the power, 2015-02-23 19:53:09]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/922293006/270001

[scottmg, 2015-02-23 20:21:49]

The CQ bit was unchecked by scottmg@chromium.org

[scottmg, 2015-02-23 20:25:19]

The CQ bit was checked by scottmg@chromium.org

[commit-bot: I haz the power, 2015-02-23 20:26:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/922293006/250002

[commit-bot: I haz the power, 2015-02-23 21:10:02]

Patchset 6 (id:??) landed as
https://crrev.com/1793e0467bb34d2545c0493a557bb038cc2ac6f0
Cr-Commit-Position: refs/heads/master@{#317648}

[scottmg, 2015-02-23 21:10:14]

Committed patchset #6 (id:250002) manually as
1793e0467bb34d2545c0493a557bb038cc2ac6f0 (presubmit successful).