Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Side by Side Diff: content/ppapi_plugin/ppapi_plugin_main.cc

Issue 1557513002: Add logic to switch to DirectWrite font proxy via field trial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove extraneous namespace qualification Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/common/sandbox_win.cc ('k') | content/public/common/dwrite_font_platform_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/debug/crash_logging.h" 7 #include "base/debug/crash_logging.h"
8 #include "base/debug/debugger.h" 8 #include "base/debug/debugger.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/threading/platform_thread.h" 13 #include "base/threading/platform_thread.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "content/child/child_process.h" 15 #include "content/child/child_process.h"
16 #include "content/common/content_constants_internal.h" 16 #include "content/common/content_constants_internal.h"
17 #include "content/common/sandbox_linux/sandbox_linux.h" 17 #include "content/common/sandbox_linux/sandbox_linux.h"
18 #include "content/ppapi_plugin/ppapi_thread.h" 18 #include "content/ppapi_plugin/ppapi_thread.h"
19 #include "content/public/common/content_client.h" 19 #include "content/public/common/content_client.h"
20 #include "content/public/common/content_switches.h" 20 #include "content/public/common/content_switches.h"
21 #include "content/public/common/main_function_params.h" 21 #include "content/public/common/main_function_params.h"
22 #include "content/public/plugin/content_plugin_client.h" 22 #include "content/public/plugin/content_plugin_client.h"
23 #include "ipc/ipc_sender.h"
23 #include "ppapi/proxy/plugin_globals.h" 24 #include "ppapi/proxy/plugin_globals.h"
24 #include "ppapi/proxy/proxy_module.h" 25 #include "ppapi/proxy/proxy_module.h"
25 #include "ui/base/ui_base_switches.h" 26 #include "ui/base/ui_base_switches.h"
26 27
27 #if defined(OS_WIN) 28 #if defined(OS_WIN)
28 #include "base/win/win_util.h" 29 #include "base/win/win_util.h"
29 #include "base/win/windows_version.h" 30 #include "base/win/windows_version.h"
31 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
30 #include "content/common/font_warmup_win.h" 32 #include "content/common/font_warmup_win.h"
33 #include "content/public/common/dwrite_font_platform_win.h"
31 #include "sandbox/win/src/sandbox.h" 34 #include "sandbox/win/src/sandbox.h"
32 #include "third_party/WebKit/public/web/win/WebFontRendering.h" 35 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
33 #include "third_party/skia/include/ports/SkTypeface_win.h" 36 #include "third_party/skia/include/ports/SkTypeface_win.h"
34 #include "ui/gfx/win/direct_write.h" 37 #include "ui/gfx/win/direct_write.h"
35 #include "ui/gfx/win/dpi.h" 38 #include "ui/gfx/win/dpi.h"
36 #endif 39 #endif
37 40
38 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
39 #include "base/files/file_util.h" 42 #include "base/files/file_util.h"
40 #endif 43 #endif
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 135
133 ChildProcess ppapi_process; 136 ChildProcess ppapi_process;
134 ppapi_process.set_main_thread( 137 ppapi_process.set_main_thread(
135 new PpapiThread(parameters.command_line, false)); // Not a broker. 138 new PpapiThread(parameters.command_line, false)); // Not a broker.
136 139
137 #if defined(OS_WIN) 140 #if defined(OS_WIN)
138 if (!base::win::IsUser32AndGdi32Available()) 141 if (!base::win::IsUser32AndGdi32Available())
139 gfx::win::MaybeInitializeDirectWrite(); 142 gfx::win::MaybeInitializeDirectWrite();
140 bool use_direct_write = gfx::win::IsDirectWriteEnabled(); 143 bool use_direct_write = gfx::win::IsDirectWriteEnabled();
141 if (use_direct_write) { 144 if (use_direct_write) {
142 WarmupDirectWrite(); 145 if (ShouldUseDirectWriteFontProxyFieldTrial()) {
146 InitializeDWriteFontProxy(
147 base::Bind(&ppapi::proxy::PluginGlobals::GetBrowserSender,
148 base::Unretained(ppapi::proxy::PluginGlobals::Get())));
149 } else {
150 WarmupDirectWrite();
151 }
143 } else { 152 } else {
144 SkTypeface_SetEnsureLOGFONTAccessibleProc(SkiaPreCacheFont); 153 SkTypeface_SetEnsureLOGFONTAccessibleProc(SkiaPreCacheFont);
145 } 154 }
146 155
147 blink::WebFontRendering::setUseDirectWrite(use_direct_write); 156 blink::WebFontRendering::setUseDirectWrite(use_direct_write);
148 blink::WebFontRendering::setDeviceScaleFactor(gfx::GetDPIScale()); 157 blink::WebFontRendering::setDeviceScaleFactor(gfx::GetDPIScale());
149 #endif 158 #endif
150 159
151 main_message_loop.Run(); 160 main_message_loop.Run();
161
162 #if defined(OS_WIN)
163 if (ShouldUseDirectWriteFontProxyFieldTrial())
164 UninitializeDWriteFontProxy();
165 #endif
152 return 0; 166 return 0;
153 } 167 }
154 168
155 } // namespace content 169 } // namespace content
OLDNEW
« no previous file with comments | « content/common/sandbox_win.cc ('k') | content/public/common/dwrite_font_platform_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698