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

Unified Diff: content/renderer/renderer_main.cc

Issue 335223003: Add trial for DirectWrite, and reorder some initialization so it can take effect (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment Created 6 years, 6 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
« no previous file with comments | « content/common/sandbox_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index d95287ba965472294c765426c8e880370858a76f..a64816a67106e7c3aa0343f1f87951a738d7ec7b 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -178,8 +178,6 @@ int RendererMain(const MainFunctionParams& parameters) {
base::PlatformThread::SetName("CrRendererMain");
- platform.PlatformInitialize();
-
bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
// Initialize histogram statistics gathering system.
@@ -200,6 +198,9 @@ int RendererMain(const MainFunctionParams& parameters) {
DCHECK(result);
}
+ // PlatformInitialize uses FieldTrials, so this must happen later.
+ platform.PlatformInitialize();
+
#if defined(ENABLE_PLUGINS)
// Load pepper plugins before engaging the sandbox.
PepperPluginRegistry::GetInstance();
« no previous file with comments | « content/common/sandbox_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698