diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 21:21:57 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 21:21:57 +0000 |
| commit | 5b58f4c9e8ac20e74455f43a0a12796a777e1635 (patch) | |
| tree | da1164930bc3714aa8ef866e9632759b2db30ba4 /webkit/support | |
| parent | 8ecce348742249122fbaf4a21870c849e4876d04 (diff) | |
| download | chromium_src-5b58f4c9e8ac20e74455f43a0a12796a777e1635.zip chromium_src-5b58f4c9e8ac20e74455f43a0a12796a777e1635.tar.gz chromium_src-5b58f4c9e8ac20e74455f43a0a12796a777e1635.tar.bz2 | |
Fix plugin blacklisting in Mac TestShell and DRT.
1) Blacklist the old plugin (TestNetscapePlugIn) in DRT. I didn't think it got copied into {Debug,Release}/plugins, but it does.
2) Enable loading plugins from {Debug,Release}/plugins in TestShell. This causes us to load the new plugin (WebKitTestNetscapePlugIn). We have code to blacklist the new plugin, but it was wrong.
BUG=48471
Review URL: http://codereview.chromium.org/5252001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support_glue.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/support/webkit_support_glue.cc b/webkit/support/webkit_support_glue.cc index 739289f..2308a40 100644 --- a/webkit/support/webkit_support_glue.cc +++ b/webkit/support/webkit_support_glue.cc @@ -15,12 +15,12 @@ namespace webkit_glue { void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); - // Don't load the forked npapi_layout_test_plugin in DRT, we only - // want to use the upstream version TestNetscapePlugIn. We don't need to - // blacklist on Mac because DRT Mac already uses the upstream version of - // TestNetscapePlugIn. + // Don't load the forked npapi_layout_test_plugin in DRT, we only want to + // use the upstream version TestNetscapePlugIn (on Mac, the upstream version + // is named WebKitTestNetscapePlugIn). const FilePath::StringType kPluginBlackList[] = { FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), + FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"), FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), }; for (int i = plugins->size() - 1; i >= 0; --i) { |