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

Review URL: https://codereview.chromium.org/900063002

Cr-Commit-Position: refs/heads/master@{#314929}

cc/layers/heads_up_display_layer_impl.cc

@@ -69,11 +69,10 @@ double HeadsUpDisplayLayerImpl::Graph::UpdateUpperBound() {
 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() {}
 
@@ -173,36 +172,36 @@ void HeadsUpDisplayLayerImpl::UpdateHudTexture(
     return;
 
   SkISize canvas_size;
-  if (hud_canvas_)
-    canvas_size = hud_canvas_->getDeviceSize();
+  if (hud_surface_)
+    canvas_size = hud_surface_->getCanvas()->getDeviceSize();
   else
     canvas_size.set(0, 0);
 
   if (canvas_size.width() != content_bounds().width() ||
-      canvas_size.height() != content_bounds().height() || !hud_canvas_) {
+      canvas_size.height() != content_bounds().height() || !hud_surface_) {
     TRACE_EVENT0("cc", "ResizeHudCanvas");
-    bool opaque = false;
-    hud_canvas_ = make_scoped_ptr(skia::CreateBitmapCanvas(
-        content_bounds().width(), content_bounds().height(), opaque));
+
+    hud_surface_ = skia::AdoptRef(SkSurface::NewRasterN32Premul(
+        content_bounds().width(), content_bounds().height()));
   }
 
   UpdateHudContents();
 
   {
     TRACE_EVENT0("cc", "DrawHudContents");
-    hud_canvas_->clear(SkColorSetARGB(0, 0, 0, 0));
-    hud_canvas_->save();
-    hud_canvas_->scale(contents_scale_x(), contents_scale_y());
+    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_canvas_.get());
+    DrawHudContents(hud_surface_->getCanvas());
 
-    hud_canvas_->restore();
+    hud_surface_->getCanvas()->restore();
   }
 
   TRACE_EVENT0("cc", "UploadHudTexture");
   SkImageInfo info;
   size_t row_bytes = 0;
-  const void* pixels = hud_canvas_->peekPixels(&info, &row_bytes);
+  const void* pixels = hud_surface_->getCanvas()->peekPixels(&info, &row_bytes);
   DCHECK(pixels);
   gfx::Rect content_rect(content_bounds());
   DCHECK(info.colorType() == kN32_SkColorType);
@@ -300,7 +299,7 @@ void HeadsUpDisplayLayerImpl::DrawText(SkCanvas* canvas,
 
   paint->setTextSize(size);
   paint->setTextAlign(align);
-  paint->setTypeface(typeface_.get());
+  paint->setTypeface(layer_tree_impl()->settings().hud_typeface.get());
   canvas->drawText(text.c_str(), text.length(), x, y, *paint);
 
   paint->setAntiAlias(anti_alias);
@@ -706,7 +705,7 @@ void HeadsUpDisplayLayerImpl::DrawDebugRect(
 
     SkPaint label_paint = CreatePaint();
     label_paint.setTextSize(kFontHeight);
-    label_paint.setTypeface(typeface_.get());
+    label_paint.setTypeface(layer_tree_impl()->settings().hud_typeface.get());
     label_paint.setColor(stroke_color);
 
     const SkScalar label_text_width =

cc/layers/heads_up_display_layer_impl.h

@@ -126,9 +126,7 @@ class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
   void ReleaseUnmatchedSizeResources(ResourceProvider* resource_provider);
 
   ScopedPtrVector<ScopedResource> resources_;
-  scoped_ptr<SkCanvas> hud_canvas_;
-
-  skia::RefPtr<SkTypeface> typeface_;
+  skia::RefPtr<SkSurface> hud_surface_;
 
   Graph fps_graph_;
   Graph paint_time_graph_;

cc/trees/layer_tree_settings.h

@@ -9,7 +9,9 @@
 #include "cc/base/cc_export.h"
 #include "cc/debug/layer_tree_debug_state.h"
 #include "cc/output/renderer_settings.h"
+#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkTypeface.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
@@ -83,6 +85,7 @@ class CC_EXPORT LayerTreeSettings {
   bool record_full_layer;
   bool use_display_lists;
   bool verify_property_trees;
+  skia::RefPtr<SkTypeface> hud_typeface;
 
   LayerTreeDebugState initial_debug_state;
 };

content/renderer/gpu/render_widget_compositor.cc

@@ -41,6 +41,7 @@
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "ui/gfx/frame_time.h"
+#include "ui/gfx/hud_font.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_switches.h"
 
@@ -433,6 +434,8 @@ void RenderWidgetCompositor::Initialize() {
         compositor_deps_->CreateExternalBeginFrameSource(widget_->routing_id());
   }
 
+  settings.hud_typeface = ui::GetHudTypeface();
+
   if (compositor_thread_task_runner.get()) {
     layer_tree_host_ = cc::LayerTreeHost::CreateThreaded(
         this, shared_bitmap_manager, gpu_memory_buffer_manager, settings,

content/renderer/renderer_main_platform_delegate_win.cc

@@ -24,6 +24,7 @@
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
+#include "ui/gfx/hud_font.h"
 #include "ui/gfx/win/direct_write.h"
 #include "ui/gfx/win/dpi.h"
 
@@ -55,10 +56,17 @@ void SkiaPreCacheFontCharacters(const LOGFONT& logfont,
 void WarmupDirectWrite() {
   // The objects used here are intentionally not freed as we want the Skia
   // code to use these objects after warmup.
+  SetDefaultSkiaFactory(GetPreSandboxWarmupFontMgr());
   SkTypeface* typeface =
       GetPreSandboxWarmupFontMgr()->legacyCreateTypeface("Times New Roman", 0);
   DoPreSandboxWarmupForTypeface(typeface);
-  SetDefaultSkiaFactory(GetPreSandboxWarmupFontMgr());
+
+  // The CC HUD needs a debug font, we warm that up here and pass it down.
+  skia::RefPtr<SkTypeface> hud_typeface =
+      skia::AdoptRef(GetPreSandboxWarmupFontMgr()->legacyCreateTypeface(
+          "Consolas", SkTypeface::kBold));
+  DoPreSandboxWarmupForTypeface(hud_typeface.get());
+  ui::SetHudTypeface(hud_typeface);
 }
 
 }  // namespace

ui/compositor/compositor.cc

@@ -31,6 +31,7 @@
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator_collection.h"
 #include "ui/gfx/frame_time.h"
+#include "ui/gfx/hud_font.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_switches.h"
 
@@ -137,6 +138,7 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
 
   settings.impl_side_painting = IsUIImplSidePaintingEnabled();
   settings.use_zero_copy = IsUIZeroCopyEnabled();
+  settings.hud_typeface = ui::GetHudTypeface();
 
   base::TimeTicks before_create = base::TimeTicks::Now();
   if (compositor_thread_loop_.get()) {

ui/gfx/BUILD.gn

@@ -105,6 +105,8 @@ component("gfx") {
     "gfx_paths.h",
     "gpu_memory_buffer.cc",
     "gpu_memory_buffer.h",
+    "hud_font.cc",
+    "hud_font.h",
     "icon_util.cc",
     "icon_util.h",
     "image/canvas_image_source.cc",

ui/gfx/gfx.gyp

@@ -182,6 +182,8 @@
         'gfx_paths.h',
         'gpu_memory_buffer.cc',
         'gpu_memory_buffer.h',
+        'hud_font.cc',
+        'hud_font.h',
         'image/canvas_image_source.cc',
         'image/canvas_image_source.h',
         'image/image.cc',

ui/gfx/hud_font.cc

+// Copyright 2015 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 "ui/gfx/hud_font.h"
+
+#include "base/lazy_instance.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+
+namespace ui {
+
+namespace {
+base::LazyInstance<skia::RefPtr<SkTypeface>> g_hud_typeface;
+}  // namespace
+
+void SetHudTypeface(skia::RefPtr<SkTypeface> typeface) {
+  g_hud_typeface.Get() = typeface;
+}
+
+skia::RefPtr<SkTypeface> GetHudTypeface() {
+  if (!g_hud_typeface.Get()) {
+    // This will be set pre-sandbox on Windows. On other platforms, just make
+    // something here.
+    SetHudTypeface(skia::AdoptRef(
+        SkTypeface::CreateFromName("monospace", SkTypeface::kBold)));
+  }
+  return g_hud_typeface.Get();
+}
+
+}  // namespace ui

ui/gfx/hud_font.h

+// Copyright 2015 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 UI_GFX_HUD_FONT_H_
+#define UI_GFX_HUD_FONT_H_
+
+#include "skia/ext/refptr.h"
+#include "ui/gfx/gfx_export.h"
+
+class SkTypeface;
+
+namespace ui {
+
+GFX_EXPORT void SetHudTypeface(skia::RefPtr<SkTypeface> typeface);
+GFX_EXPORT skia::RefPtr<SkTypeface> GetHudTypeface();
+
+}  // namespace ui
+
+#endif  // UI_GFX_HUD_FONT_H_