Chromium Code Reviews| Index: content/common/sandbox_win.cc |
| diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc |
| index 937ab23e12e8c9dafd93cf64a6a5cecc9272aa3f..9e5f55cfb0bf06626aa9b1888483c6269f6e3216 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 (!content::ShouldUseDirectWriteFontProxyFieldTrial()) { |
|
jam
2016/01/11 05:05:45
ditto
Ilya Kulshin
2016/01/11 20:56:52
Done.
|
| + // 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))); |
| + } |
| } |
| } |
| } |