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

Unified Diff: content/common/sandbox_win.cc

Issue 1845063002: Revert of Remove font cache code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/dwrite_font_platform_win_unittest.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/sandbox_win.cc
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
index 8be9b1115c9e61cc12f7b0a5d374c0d640c31253..86b0dcb4fb42cf41797feb882d2a0dbbb57db798 100644
--- a/content/common/sandbox_win.cc
+++ b/content/common/sandbox_win.cc
@@ -32,6 +32,7 @@
#include "content/common/content_switches_internal.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
+#include "content/public/common/dwrite_font_platform_win.h"
#include "content/public/common/sandbox_init.h"
#include "content/public/common/sandboxed_process_launcher_delegate.h"
#include "sandbox/win/src/process_mitigations.h"
@@ -756,6 +757,24 @@
true,
sandbox::TargetPolicy::FILES_ALLOW_READONLY,
policy);
+
+ 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()));
+
+ if (direct_write_font_cache_section.Open(name, true)) {
+ HANDLE handle = direct_write_font_cache_section.handle().GetHandle();
+ policy->AddHandleToShare(handle);
+ cmd_line->AppendSwitchASCII(
+ switches::kFontCacheSharedHandle,
+ base::UintToString(base::win::HandleToUint32(handle)));
+ }
+ }
}
}
#endif
« no previous file with comments | « content/common/dwrite_font_platform_win_unittest.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698