Index: content/common/sandbox_win.cc |
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc |
index 937ab23e12e8c9dafd93cf64a6a5cecc9272aa3f..523073863b7c667862146a9fe0d102bcafc3585d 100644 |
--- a/content/common/sandbox_win.cc |
+++ b/content/common/sandbox_win.cc |
@@ -738,21 +738,23 @@ base::Process StartSandboxedProcess( |
sandbox::TargetPolicy::FILES_ALLOW_READONLY, |
policy); |
- // If DirectWrite is enabled for font rendering then open the font cache |
- // section which is created by the browser and pass the handle to the |
- // renderer process. This is needed because renderer processes on |
- // Windows 8+ may be running in an AppContainer sandbox and hence their |
- // kernel object namespace may be partitioned. |
- std::string name(content::kFontCacheSharedSectionName); |
- name.append(base::UintToString(base::GetCurrentProcId())); |
- |
- base::SharedMemory direct_write_font_cache_section; |
- if (direct_write_font_cache_section.Open(name, true)) { |
- void* shared_handle = policy->AddHandleToShare( |
- direct_write_font_cache_section.handle().GetHandle()); |
- cmd_line->AppendSwitchASCII( |
- switches::kFontCacheSharedHandle, |
- base::UintToString(base::win::HandleToUint32(shared_handle))); |
+ if (!ShouldUseDirectWriteFontProxyFieldTrial()) { |
+ // If DirectWrite is enabled for font rendering then open the font |
+ // cache section which is created by the browser and pass the handle to |
+ // the renderer process. This is needed because renderer processes on |
+ // Windows 8+ may be running in an AppContainer sandbox and hence their |
+ // kernel object namespace may be partitioned. |
+ std::string name(content::kFontCacheSharedSectionName); |
+ name.append(base::UintToString(base::GetCurrentProcId())); |
+ |
+ base::SharedMemory direct_write_font_cache_section; |
+ if (direct_write_font_cache_section.Open(name, true)) { |
+ void* shared_handle = policy->AddHandleToShare( |
+ direct_write_font_cache_section.handle().GetHandle()); |
+ cmd_line->AppendSwitchASCII( |
+ switches::kFontCacheSharedHandle, |
+ base::UintToString(base::win::HandleToUint32(shared_handle))); |
+ } |
} |
} |
} |