Fixes for two different HUD issues related to win32k lockdown

content/renderer/renderer_main_platform_delegate_win.cc

 // Copyright (c) 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 "content/renderer/renderer_main_platform_delegate.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/injection_test_win.h"
 #include "content/public/renderer/render_font_warmup_win.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/render_thread_impl.h"
 #include "sandbox/win/src/sandbox.h"
 #include "skia/ext/fontmgr_default_win.h"
 #include "skia/ext/vector_platform_device_emf_win.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
 #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"
 
 #include <dwrite.h>
 
 namespace content {
 namespace {
 
 // Windows-only skia sandbox support
 // These are used for GDI-path rendering.
@@ skipping 11 matching lines @@
   if (render_thread_impl) {
     render_thread_impl->PreCacheFontCharacters(
         logfont,
         base::string16(text, text_length));
   }
 }
 
 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 =

[danakj, 2015/02/05 22:56:47]

bonus points for doing the AdoptRef here, though.

[scottmg, 2015/02/05 23:21:57]

This one has to leak for the sandbox, so I'd have to store the refptr in a
global or something. So I'm going to leave this one as is.

[danakj, 2015/02/05 23:24:11]

Then I'm concerned about below. You adopt-ref it there. So this pointer will be
deleted when the HudTypeface goes away (tho it's a global so never).

I'm not sure how moving the AdoptRef from there to here would change lifetimes,
though, so is something wrong going on now?

       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.
+  typeface = GetPreSandboxWarmupFontMgr()->legacyCreateTypeface(
+      "Consolas", SkTypeface::kBold);
+  DoPreSandboxWarmupForTypeface(typeface);
+  ui::SetHudTypeface(skia::AdoptRef(typeface));
 }
 
 }  // namespace
 
 RendererMainPlatformDelegate::RendererMainPlatformDelegate(
     const MainFunctionParams& parameters)
         : parameters_(parameters),
           sandbox_test_module_(NULL) {
 }
 
@@ skipping 44 matching lines @@
     ::GetUserDefaultLangID();
     ::GetUserDefaultLCID();
 
     target_services->LowerToken();
     return true;
   }
   return false;
 }
 
 }  // namespace content