Switch to direct write font proxy and remove the font cache.

content/test/layouttest_support.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/public/test/layouttest_support.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "components/test_runner/test_common.h"
@@ skipping 19 matching lines @@
 #include "third_party/WebKit/public/platform/WebBatteryStatus.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionData.h"
 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceOrientationData.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 #if defined(OS_MACOSX)
 #include "content/browser/frame_host/popup_menu_helper_mac.h"
 #elif defined(OS_WIN)
-#include "content/common/font_warmup_win.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkTypeface_win.h"
 #include "ui/gfx/win/direct_write.h"
 #endif
 
 using blink::WebBatteryStatus;
 using blink::WebDeviceMotionData;
 using blink::WebDeviceOrientationData;
 using blink::WebGamepad;
 using blink::WebGamepads;
 using blink::WebRect;
 using blink::WebSize;
@@ skipping 31 matching lines @@
   typedef test_runner::WebFrameTestProxy<
       RenderFrameImpl, const RenderFrameImpl::CreateParams&> FrameProxy;
 
   FrameProxy* render_frame_proxy = new FrameProxy(params);
   render_frame_proxy->set_base_proxy(GetWebTestProxyBase(params.render_view));
 
   return render_frame_proxy;
 }
 
 #if defined(OS_WIN)
+void DoPreSandboxWarmupForTypeface(SkTypeface* typeface) {

[ananta, 2015/12/09 23:14:28]

Why do we need this now?

[Ilya Kulshin, 2015/12/15 00:05:57]

I thought it was needed at some point, but looks like it's not needed anymore.
Removed.

+  SkPaint paint_warmup;
+  paint_warmup.setTypeface(typeface);
+  wchar_t glyph = L'S';
+  paint_warmup.measureText(&glyph, sizeof(glyph));
+}
+
 // DirectWrite only has access to %WINDIR%\Fonts by default. For developer
 // side-loading, support kRegisterFontFiles to allow access to additional fonts.
 void RegisterSideloadedTypefaces(SkFontMgr* fontmgr) {
   RenderThreadImpl::current()->EnsureWebKitInitialized();
   std::vector<std::string> files = switches::GetSideloadFontFiles();
   for (std::vector<std::string>::const_iterator i(files.begin());
        i != files.end();
        ++i) {
     SkTypeface* typeface = fontmgr->createFromFile(i->c_str());
     DoPreSandboxWarmupForTypeface(typeface);
@@ skipping 61 matching lines @@
   RenderThreadImpl::current()
       ->blink_platform_impl()
       ->MockBatteryStatusChangedForTesting(status);
 }
 
 void EnableRendererLayoutTestMode() {
   RenderThreadImpl::current()->set_layout_test_mode(true);
 
 #if defined(OS_WIN)
   if (gfx::win::ShouldUseDirectWrite())
-    RegisterSideloadedTypefaces(GetPreSandboxWarmupFontMgr());
+    RegisterSideloadedTypefaces(SkFontMgr_New_DirectWrite());
 #endif
 }
 
 void EnableBrowserLayoutTestMode() {
 #if defined(OS_MACOSX)
   ImageTransportSurface::SetAllowOSMesaForTesting(true);
   PopupMenuHelper::DontShowPopupMenuForTesting();
 #endif
   RenderWidgetHostImpl::DisableResizeAckCheckForTesting();
 }
@@ skipping 265 matching lines @@
     result.append(
         DumpHistoryItem(entry->root_history_node(),
                         8,
                         index == current_index));
   }
   result.append("===============================================\n");
   return result;
 }
 
 }  // namespace content