diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp b/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp index 804455490..95f589b5f 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp +++ b/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp @@ -189,7 +189,12 @@ static inline String pathExtension(const KURL& url) } #if !PLATFORM(MAC) -bool PluginInfoStore::shouldBlockPlugin(const PluginModuleInfo&) +PluginModuleLoadPolicy PluginInfoStore::policyForPlugin(const PluginModuleInfo&) +{ + return PluginModuleLoadNormally; +} + +bool PluginInfoStore::reactivateInactivePlugin(const PluginModuleInfo&) { return false; } |