diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 01:46:16 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 01:46:16 +0000 |
| commit | 01686ff7c87a0f1ffdafb43d70f2137c441f4e42 (patch) | |
| tree | 8e20a0b08fae832c481c0b63fc4dadf25f8cb42b /content/ppapi_plugin | |
| parent | dd3759b65acd3b450f2e450b1a001c38f8d3d767 (diff) | |
| download | chromium_src-01686ff7c87a0f1ffdafb43d70f2137c441f4e42.zip chromium_src-01686ff7c87a0f1ffdafb43d70f2137c441f4e42.tar.gz chromium_src-01686ff7c87a0f1ffdafb43d70f2137c441f4e42.tar.bz2 | |
Warm up dxva2.dll for pepflashplayer.dll
BUG=265610
R=piman@chromium.org
Review URL: https://codereview.chromium.org/21186002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 370e465..e5120c6 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -43,6 +43,7 @@ #if defined(OS_WIN) #include "base/win/win_util.h" +#include "base/win/windows_version.h" #include "sandbox/win/src/sandbox.h" #elif defined(OS_MACOSX) #include "content/common/sandbox_init_mac.h" @@ -325,6 +326,13 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path, // can be loaded. TODO(cpu): consider changing to the loading style of // regular plugins. if (g_target_services) { + // Let Flash load DRM before lockdown on Vista+. + if (permissions.HasPermission(ppapi::PERMISSION_FLASH) && + base::win::OSInfo::GetInstance()->version() >= + base::win::VERSION_VISTA ) { + LoadLibrary(L"dxva2.dll"); + } + // Cause advapi32 to load before the sandbox is turned on. unsigned int dummy_rand; rand_s(&dummy_rand); |