Commit e4169907 authored by yzshen@chromium.org's avatar yzshen@chromium.org

Warm up EnumSystemLocalesEx() for Flash Player.

Land the patch on behalf of Ye Liu <cbakgly@gmail.com>

The original CL is:
https://codereview.chromium.org/137893002/
(All the three reviewers on the TBR line have LG-ed that CL.)

TBR=piman@chromium.org,jschuh@chromium.org,yzshen@chromium.org
BUG=None

Review URL: https://codereview.chromium.org/161263002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250852 0039d316-1c4b-4281-b951-d872f2087c98
parent baff4a61
......@@ -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>
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment