Changeset 166943 in webkit

Timestamp:

Apr 8, 2014 12:12:37 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

Refactor to make JSMainThreadExecState's constructor and destructor private.
<​https://webkit.org/b/131372>

Reviewed by Mark Hahnenberg.

This is in preparation for subsequent patches to ensure that we don't
exit the VM with an exception still pending.

No new tests required. This is only a refactor of existing behavior.

• bindings/js/JSDOMGlobalObjectTask.cpp:
• bindings/js/JSMainThreadExecState.h:

(WebCore::JSMainThreadExecState::runTask):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMGlobalObjectTask.cpp (modified) (1 diff)
• bindings/js/JSMainThreadExecState.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-08  Mark Lam  <mark.lam@apple.com>
+
+        Refactor to make JSMainThreadExecState's constructor and destructor private.
+        <https://webkit.org/b/131372>
+
+        Reviewed by Mark Hahnenberg.
+
+        This is in preparation for subsequent patches to ensure that we don't
+        exit the VM with an exception still pending.
+
+        No new tests required.  This is only a refactor of existing behavior.
+
+        * bindings/js/JSDOMGlobalObjectTask.cpp:
+        * bindings/js/JSMainThreadExecState.h:
+        (WebCore::JSMainThreadExecState::runTask):
+
 2014-04-07  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp

@@ -61 +61 @@
         // When on the main thread (e.g. the document's thread), we need to make sure to
         // push the current ExecState on to the JSMainThreadExecState stack.
-        if (context->isDocument()) {
-            JSMainThreadExecState currentState(exec);
-            m_task->run(exec);
-        } else
+        if (context->isDocument())
+            JSMainThreadExecState::runTask(exec, *m_task.get());
+        else
             m_task->run(exec);
     }

trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h

@@ -29 +29 @@
 #include "JSDOMBinding.h"
 #include <runtime/Completion.h>
+#include <runtime/Microtask.h>
 #include <wtf/MainThread.h>
 
@@ -63 +64 @@
     };
 
+    static void runTask(JSC::ExecState* exec, JSC::Microtask& task)
+    {
+        JSMainThreadExecState currentState(exec);
+        task.run(exec);
+    }
+
     static InspectorInstrumentationCookie instrumentFunctionCall(ScriptExecutionContext*, JSC::CallType, const JSC::CallData&);
 
+private:
     explicit JSMainThreadExecState(JSC::ExecState* exec)
         : m_previousState(s_mainThreadState)
@@ -84 +92 @@
     }
 
-private:
     static JSC::ExecState* s_mainThreadState;
     JSC::ExecState* m_previousState;