Index: content/renderer/renderer_main_platform_delegate_win.cc |
diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc |
index e1dd2e3ccb0a7a8650749c8f6adf58f9fba28457..a557eabdac708d9adb6e93a50907d31ea468df3f 100644 |
--- a/content/renderer/renderer_main_platform_delegate_win.cc |
+++ b/content/renderer/renderer_main_platform_delegate_win.cc |
@@ -16,7 +16,6 @@ |
#include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h" |
#include "content/child/font_warmup_win.h" |
#include "content/public/common/content_switches.h" |
-#include "content/public/common/dwrite_font_platform_win.h" |
#include "content/public/common/injection_test_win.h" |
#include "content/public/renderer/render_thread.h" |
#include "content/renderer/render_thread_impl.h" |
@@ -75,10 +74,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() { |
scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); |
if (use_direct_write) { |
- if (ShouldUseDirectWriteFontProxyFieldTrial()) |
- InitializeDWriteFontProxy(base::Bind(&GetRenderThreadSender)); |
- else |
- WarmupDirectWrite(); |
+ InitializeDWriteFontProxy(base::Bind(&GetRenderThreadSender)); |
} else { |
SkTypeface_SetEnsureLOGFONTAccessibleProc(SkiaPreCacheFont); |
} |
@@ -88,8 +84,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() { |
} |
void RendererMainPlatformDelegate::PlatformUninitialize() { |
- if (ShouldUseDirectWriteFontProxyFieldTrial()) |
- UninitializeDWriteFontProxy(); |
+ UninitializeDWriteFontProxy(); |
} |
bool RendererMainPlatformDelegate::EnableSandbox() { |