summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-22 09:09:45 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-22 09:10:13 +0100
commit470286ecfe79d59df14944e5b5d34630fc739391 (patch)
tree43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit2/WebProcess/Plugins/PluginView.cpp
parent23037105e948c2065da5a937d3a2396b0ff45c1e (diff)
downloadqtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/PluginView.cpp')
-rw-r--r--Source/WebKit2/WebProcess/Plugins/PluginView.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp b/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
index e82704105..44f575ad5 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -68,7 +68,7 @@ using namespace WebCore;
namespace WebKit {
-static const double pluginSnapshotTimerDelay = 3;
+static const double pluginSnapshotTimerDelay = 1;
class PluginView::URLRequest : public RefCounted<URLRequest> {
public:
@@ -784,6 +784,11 @@ bool PluginView::isEditingCommandEnabled(const String& commandName)
return m_plugin->isEditingCommandEnabled(commandName);
}
+bool PluginView::shouldAllowScripting()
+{
+ return m_plugin->shouldAllowScripting();
+}
+
void PluginView::notifyWidget(WidgetNotification notification)
{
switch (notification) {