Index: content/ppapi_plugin/ppapi_thread.cc |
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc |
index aa801aafe9be5e2a7801102474124d7f3706bdeb..c7c2de33097b18ced4e508f17fc58437715db78d 100644 |
--- a/content/ppapi_plugin/ppapi_thread.cc |
+++ b/content/ppapi_plugin/ppapi_thread.cc |
@@ -51,6 +51,7 @@ |
#if defined(OS_WIN) |
#include "base/win/win_util.h" |
#include "base/win/windows_version.h" |
+#include "content/public/common/render_font_warmup_win.h" |
#include "sandbox/win/src/sandbox.h" |
#elif defined(OS_MACOSX) |
#include "content/common/sandbox_init_mac.h" |
@@ -425,6 +426,13 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path, |
WarmupWindowsLocales(permissions); |
+ // If Win32k lockdown is on and loading Flash then we need to patch |
+ // its GDI font enumeration code. |
palmer
2015/09/11 22:34:16
Nit: The code is admirably clear, so I don't think
|
+ if (IsWin32kLockdownEnabled() && |
+ permissions.HasPermission(ppapi::PERMISSION_FLASH)) { |
+ PatchGdiFontEnumeration(path); |
+ } |
+ |
g_target_services->LowerToken(); |
} |
#endif |