Changeset 31197 in webkit

Timestamp:

Mar 20, 2008 5:13:56 PM (16 years ago)

Author:

Adam Roben

Message:

Allow blocking of JS event handlers/javascript: URIs per-Frame

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>

Two new methods are added to KJSProxy: setPaused and isPaused. When
setPaused(true) is called, JS event handlers are blocked and
javascript: URIs will not be evaluated.

Reviewed by Tim Hatcher.

• bindings/js/kjs_events.cpp: (WebCore::JSAbstractEventListener::handleEvent):
  • Removed some old KJS_DEBUGGER code
  • Don't run the handler if the KJSProxy is paused.
• bindings/js/kjs_proxy.cpp: (WebCore::KJSProxy::KJSProxy): Initialize new member.
• bindings/js/kjs_proxy.h: Added new methods.
• loader/FrameLoader.cpp: (WebCore::FrameLoader::executeScript): Don't execute the script if the KJSProxy is paused.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/kjs_events.cpp (modified) (2 diffs)
• bindings/js/kjs_proxy.cpp (modified) (1 diff)
• bindings/js/kjs_proxy.h (modified) (2 diffs)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-20  Adam Roben  <aroben@apple.com>
+
+        Allow blocking of JS event handlers/javascript: URIs per-Frame
+
+        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>
+
+        Two new methods are added to KJSProxy: setPaused and isPaused. When
+        setPaused(true) is called, JS event handlers are blocked and
+        javascript: URIs will not be evaluated.
+
+        Reviewed by Tim Hatcher.
+
+        * bindings/js/kjs_events.cpp:
+        (WebCore::JSAbstractEventListener::handleEvent):
+          - Removed some old KJS_DEBUGGER code
+          - Don't run the handler if the KJSProxy is paused.
+        * bindings/js/kjs_proxy.cpp:
+        (WebCore::KJSProxy::KJSProxy): Initialize new member.
+        * bindings/js/kjs_proxy.h: Added new methods.
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::executeScript): Don't execute the script if the
+        KJSProxy is paused.
+
 2008-03-20  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/bindings/js/kjs_events.cpp

@@ -49 +49 @@
 void JSAbstractEventListener::handleEvent(Event* ele, bool isWindowEvent)
 {
-#ifdef KJS_DEBUGGER
-    if (KJSDebugWin::instance() && KJSDebugWin::instance()->inSession())
-        return;
-#endif
-
     Event* event = ele;
 
@@ -68 +63 @@
     if (!frame)
         return;
-    if (!frame->scriptProxy()->isEnabled())
+    KJSProxy* scriptProxy = frame->scriptProxy();
+    if (!scriptProxy->isEnabled() || scriptProxy->isPaused())
         return;
 
     JSLock lock;
 
-    JSGlobalObject* globalObject = frame->scriptProxy()->globalObject();
+    JSGlobalObject* globalObject = scriptProxy->globalObject();
     ExecState* exec = globalObject->globalExec();
 

trunk/WebCore/bindings/js/kjs_proxy.cpp

@@ -50 +50 @@
     , m_processingTimerCallback(0)
     , m_processingInlineCode(0)
+    , m_paused(false)
 {
 }

trunk/WebCore/bindings/js/kjs_proxy.h

@@ -71 +71 @@
     void attachDebugger(KJS::Debugger*);
 
+    void setPaused(bool b) { m_paused = b; }
+    bool isPaused() const { return m_paused; }
+
 private:
     void initScriptIfNeeded()
@@ -85 +88 @@
     bool m_processingTimerCallback;
     bool m_processingInlineCode;
+    bool m_paused;
 };
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -757 +757 @@
 JSValue* FrameLoader::executeScript(const String& url, int baseLine, const String& script)
 {
-    if (!m_frame->scriptProxy()->isEnabled())
+    KJSProxy* scriptProxy = m_frame->scriptProxy();
+
+    if (!scriptProxy->isEnabled() || scriptProxy->isPaused())
         return 0;