content/common/sandbox_win.cc - Issue 1325843002: Added directwrite warmup for PPAPI processes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/sandbox_win.cc

Issue 1325843002: Added directwrite warmup for PPAPI processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add_win32k_enable_policy

Patch Set: Made win32k lockdown check a lazy instance. Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

« content/browser/ppapi_plugin_process_host.cc ('K') | « content/browser/ppapi_plugin_process_host.cc ('k') | content/ppapi_plugin/ppapi_plugin_main.cc » ('j') | content/ppapi_plugin/ppapi_thread.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/sandbox_win.cc

diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc

index a3c26e1267e0dd17822ea7a9058f88781230f669..edb2c94ca910d27b554f3a7f988f1b603c6535e0 100644

--- a/content/common/sandbox_win.cc

+++ b/content/common/sandbox_win.cc

@@ -708,8 +708,9 @@ base::Process StartSandboxedProcess(

if (!disable_default_policy && !AddPolicyForSandboxedProcess(policy))

return base::Process();

- if (type_str == switches::kRendererProcess) {

#if !defined(NACL_WIN64)

+ if (type_str == switches::kRendererProcess ||

+ type_str == switches::kPpapiPluginProcess) {

if (gfx::win::ShouldUseDirectWrite()) {

AddDirectory(base::DIR_WINDOWS_FONTS,

NULL,

@@ -733,8 +734,10 @@ base::Process StartSandboxedProcess(

base::UintToString(reinterpret_cast<unsigned int>(shared_handle)));

}

+ }

#endif

- } else {

+ if (type_str != switches::kRendererProcess) {

// Hack for Google Desktop crash. Trick GD into not injecting its DLL into

// this subprocess. See

// http://code.google.com/p/chromium/issues/detail?id=25580