diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 10 |
2 files changed, 11 insertions, 0 deletions
@@ -334,6 +334,7 @@ Yael Aharon <yael.aharon@intel.com> Yair Yogev <progame@chromium.org> Yang Gu <yang.gu@intel.com> Yarin Kaul <yarin.kaul@gmail.com> +Ye Liu <cbakgly@gmail.com> Yi Shen <yi.shen@samsung.com> Yoav Weiss <yoav@yoav.ws> Yoav Zilberberg <yoav.zilberberg@gmail.com> diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 5ed1873..e5ad093 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -52,6 +52,11 @@ #if defined(OS_WIN) extern sandbox::TargetServices* g_target_services; + +// Used by EnumSystemLocales for warming up. +static BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString) { + return TRUE; +} #else extern void* g_target_services; #endif @@ -297,6 +302,11 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path, ::GetUserDefaultLangID(); ::GetUserDefaultLCID(); + if (permissions.HasPermission(ppapi::PERMISSION_FLASH)) { + // Warm up system locales. + EnumSystemLocalesW(EnumLocalesProc, LCID_INSTALLED); + } + g_target_services->LowerToken(); } #endif |