Changeset 31199 in webkit

Timestamp:

Mar 20, 2008 5:14:58 PM (16 years ago)

Author:

Adam Roben

Message:

Allow pausing/blocking of JS execution by plugins

Part of Bug 17133: Should support pausing JavaScript execution without
hanging the process

<​http://bugs.webkit.org/show_bug.cgi?id=17133>
<rdar://problem/5719551>

This patch doesn't affect Mac, which doesn't use the shared PluginView
code.

Note that this patch doesn't prevent plugins from executing JS via an
NPObject they've already gotten hold of. It just blocks obtaining new
NPObjects and pauses any requests to evaluate javascript: URIs. This
is probably good enough for now because most plugins seem to always
obtain the Window object each time they want to execute JS.

Reviewed by Tim Hatcher.

• plugins/PluginView.cpp: (WebCore::PluginView::getValue): Return an error if JS is paused. (WebCore::PluginView::setJavaScriptPaused): Stop the request timer if we're pausing, and resume it if we're unpausing. (WebCore::PluginView::PluginView): Initialize new members.
• plugins/PluginView.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginView.cpp (modified) (3 diffs)
• plugins/PluginView.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-20  Adam Roben  <aroben@apple.com>
+
+        Allow pausing/blocking of JS execution by plugins
+
+        Part of Bug 17133: Should support pausing JavaScript execution without
+        hanging the process
+
+        <http://bugs.webkit.org/show_bug.cgi?id=17133>
+        <rdar://problem/5719551>
+
+        This patch doesn't affect Mac, which doesn't use the shared PluginView
+        code.
+
+        Note that this patch doesn't prevent plugins from executing JS via an
+        NPObject they've already gotten hold of. It just blocks obtaining new
+        NPObjects and pauses any requests to evaluate javascript: URIs. This
+        is probably good enough for now because most plugins seem to always
+        obtain the Window object each time they want to execute JS.
+
+        Reviewed by Tim Hatcher.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::getValue): Return an error if JS is paused.
+        (WebCore::PluginView::setJavaScriptPaused): Stop the request timer if
+        we're pausing, and resume it if we're unpausing.
+        (WebCore::PluginView::PluginView): Initialize new members.
+        * plugins/PluginView.h:
+
 2008-03-20  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/plugins/PluginView.cpp

@@ -393 +393 @@
 NPError PluginView::getValue(NPNVariable variable, void* value)
 {
+    if (m_isJavaScriptPaused)
+        return NPERR_GENERIC_ERROR;
+
     switch (variable) {
 #if ENABLE(NETSCAPE_PLUGIN_API)
@@ -478 +481 @@
 
     return false;
+}
+
+void PluginView::setJavaScriptPaused(bool paused)
+{
+    if (m_isJavaScriptPaused == paused)
+        return;
+    m_isJavaScriptPaused = paused;
+
+    if (m_isJavaScriptPaused) {
+        m_requestTimerWasActive = m_requestTimer.isActive();
+        m_requestTimer.stop();
+    } else if (m_requestTimerWasActive)
+        m_requestTimer.startOneShot(0);
 }
 
@@ -566 +582 @@
     , m_loadManually(loadManually)
     , m_manualStream(0)
+    , m_isJavaScriptPaused(false)
+    , m_requestTimerWasActive(false)
 {
     if (!m_plugin) {

trunk/WebCore/plugins/PluginView.h

@@ -130 +130 @@
         bool arePopupsAllowed() const;
 
+        void setJavaScriptPaused(bool);
+
         void disconnectStream(PluginStream*);
         void streamDidFinishLoading(PluginStream* stream) { disconnectStream(stream); }
@@ -234 +236 @@
         RefPtr<PluginStream> m_manualStream;
 
+        bool m_isJavaScriptPaused;
+        bool m_requestTimerWasActive;
+
         static PluginView* s_currentPluginView;
     };