Attachment 346561 Details for Bug 188246 – Patch

[patch] Patch

bug-188246-20180804083559.patch (text/plain), 255.96 KB, created by Yusuke Suzuki on 2018-08-03 16:36:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2018-08-03 16:36:00 PDT

Size: 255.96 KB

patch

obsolete

>Subversion Revision: 234564
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ec1e99b3d81663658f23eb5bee6acd701a4612ea..3229c989361349007b89c647827d15678e423bde 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,136 @@
>+2018-08-03  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        Add the support for micro tasks in workers
>+        https://bugs.webkit.org/show_bug.cgi?id=188246
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch adds microtask mechanism to workers. To adopt the existing microtask mechanism in main thread,
>+        we extends JSMainThreadExecState for non-main-threads. We rename it to JSExecState, and store stacked
>+        ExecState* data in thread local storage in ThreadGlobalData instead of a static variable s_mainThreadState.
>+
>+        We add MicrotaskQueue to WorkerGlobalScope since each worker has its own thread and it should have its
>+        own microtask queue.
>+
>+        * Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp:
>+        * Sources.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * bindings/js/JSBindingsAllInOne.cpp:
>+        * bindings/js/JSCallbackData.cpp:
>+        (WebCore::JSCallbackData::invokeCallback):
>+        * bindings/js/JSCustomElementInterface.cpp:
>+        (WebCore::constructCustomElementSynchronously):
>+        (WebCore::JSCustomElementInterface::upgradeElement):
>+        (WebCore::JSCustomElementInterface::invokeCallback):
>+        * bindings/js/JSCustomXPathNSResolver.cpp:
>+        (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
>+        * bindings/js/JSDOMGlobalObjectTask.cpp:
>+        * bindings/js/JSDOMWindowBase.cpp:
>+        (WebCore::JSDOMWindowBase::queueTaskToEventLoop):
>+        Queue a microtask to MicrotaskQueue instead of posting a macrotask.
>+
>+        (WebCore::JSDOMWindowMicrotaskCallback::create): Deleted.
>+        (WebCore::JSDOMWindowMicrotaskCallback::call): Deleted.
>+        (WebCore::JSDOMWindowMicrotaskCallback::JSDOMWindowMicrotaskCallback): Deleted.
>+        (): Deleted.
>+        Extract JSDOMWindowMicrotaskCallback as JSMicrotaskCallback and create a new file for it.
>+
>+        * bindings/js/JSErrorHandler.cpp:
>+        (WebCore::JSErrorHandler::handleEvent):
>+        * bindings/js/JSEventListener.cpp:
>+        (WebCore::JSEventListener::handleEvent):
>+        * bindings/js/JSExecState.cpp: Renamed from Source/WebCore/bindings/js/JSMainThreadExecState.cpp.
>+        (WebCore::JSExecState::didLeaveScriptContext):
>+        If we are in a main thread, we consume main thread microtask queue. If we are in worker thread,
>+        we consume a microtask queue per worker.
>+
>+        (WebCore::functionCallHandlerFromAnyThread):
>+        (WebCore::evaluateHandlerFromAnyThread):
>+        * bindings/js/JSExecState.h: Renamed from Source/WebCore/bindings/js/JSMainThreadExecState.h.
>+        (WebCore::JSExecState::currentState):
>+        (WebCore::JSExecState::call):
>+        (WebCore::JSExecState::evaluate):
>+        (WebCore::JSExecState::profiledCall):
>+        (WebCore::JSExecState::profiledEvaluate):
>+        (WebCore::JSExecState::runTask):
>+        (WebCore::JSExecState::loadModule):
>+        (WebCore::JSExecState::linkAndEvaluateModule):
>+        (WebCore::JSExecState::JSExecState):
>+        (WebCore::JSExecState::~JSExecState):
>+        (WebCore::JSExecState::setCurrentState):
>+        Store and load ExecState in thread local storage, ThreadGlobalData. This allows us to use it for workers.
>+
>+        (WebCore::JSMainThreadNullState::JSMainThreadNullState):
>+        (WebCore::JSMainThreadNullState::~JSMainThreadNullState):
>+        We keep this name "JSMainThreadNullState" since CustomElementReactionStack should be stick to the main thread.
>+        And this class is only used in the main thread.
>+
>+        * bindings/js/JSExecStateInstrumentation.h: Renamed from Source/WebCore/bindings/js/JSMainThreadExecStateInstrumentation.h.
>+        (WebCore::JSExecState::instrumentFunctionInternal):
>+        (WebCore::JSExecState::instrumentFunctionCall):
>+        (WebCore::JSExecState::instrumentFunctionConstruct):
>+        * bindings/js/JSMicrotaskCallback.h: Copied from Source/WebKitLegacy/mac/DOM/DOMHTMLBaseElement.mm.
>+        (WebCore::JSMicrotaskCallback::create):
>+        (WebCore::JSMicrotaskCallback::call):
>+        (WebCore::JSMicrotaskCallback::JSMicrotaskCallback):
>+        * bindings/js/JSWorkerGlobalScopeBase.cpp:
>+        (WebCore::JSWorkerGlobalScopeBase::queueTaskToEventLoop):
>+        * bindings/js/ScheduledAction.cpp:
>+        (WebCore::ScheduledAction::executeFunctionInContext):
>+        * bindings/js/ScriptController.cpp:
>+        (WebCore::ScriptController::evaluateInWorld):
>+        (WebCore::ScriptController::loadModuleScriptInWorld):
>+        (WebCore::ScriptController::linkAndEvaluateModuleScriptInWorld):
>+        (WebCore::ScriptController::canAccessFromCurrentOrigin):
>+        * bindings/js/WorkerScriptController.cpp:
>+        (WebCore::WorkerScriptController::evaluate):
>+        * bridge/objc/WebScriptObject.mm:
>+        (-[WebScriptObject callWebScriptMethod:withArguments:]):
>+        (-[WebScriptObject evaluateWebScript:]):
>+        * html/canvas/WebGLRenderingContextBase.cpp:
>+        (WebCore::WebGLRenderingContextBase::compileShader):
>+        (WebCore::WebGLRenderingContextBase::printToConsole):
>+        * inspector/InspectorCanvas.cpp:
>+        (WebCore::InspectorCanvas::buildObjectForCanvas):
>+        (WebCore::InspectorCanvas::buildAction):
>+        * inspector/InspectorController.cpp:
>+        * inspector/InspectorFrontendHost.cpp:
>+        * inspector/TimelineRecordFactory.cpp:
>+        (WebCore::TimelineRecordFactory::createGenericRecord):
>+        * inspector/WorkerInspectorController.cpp:
>+        * inspector/agents/InspectorCanvasAgent.cpp:
>+        * inspector/agents/InspectorNetworkAgent.cpp:
>+        (WebCore::InspectorNetworkAgent::buildInitiatorObject):
>+        * page/DOMWindow.cpp:
>+        (WebCore::DOMWindow::postMessage):
>+        * page/PageConsoleClient.cpp:
>+        (WebCore::PageConsoleClient::addMessage):
>+        * page/csp/ContentSecurityPolicy.cpp:
>+        (WebCore::ContentSecurityPolicy::reportViolation const):
>+        * platform/ThreadGlobalData.h:
>+        (WebCore::ThreadGlobalData::ThreadGlobalData::currentState const):
>+        (WebCore::ThreadGlobalData::ThreadGlobalData::setCurrentState):
>+        * workers/WorkerGlobalScope.cpp:
>+        (WebCore::WorkerGlobalScope::WorkerGlobalScope):
>+        (WebCore::WorkerGlobalScope::removeMicrotaskQueue):
>+        * workers/WorkerGlobalScope.h:
>+        (WebCore::WorkerGlobalScope::microtaskQueue const):
>+        * workers/WorkerThread.cpp:
>+        (WebCore::WorkerThread::stop):
>+        * workers/service/ExtendableEvent.cpp:
>+        (WebCore::ExtendableEvent::addExtendLifetimePromise):
>+        When dispatching an "install" event from service worker, we first create an event,
>+        dispatch it, and set a handler which is called when a pending promise count becomes zero.
>+        However, the old code checked pending promise count in a queued microtask. It worked
>+        previously because microtask is actually a macrotask in the service worker. So this check
>+        is done after a handler is set. But this patch introduces real microtask, and this check
>+        happens before a handler is set because dispatching an event can exhaust microtask queue.
>+        According to the spec, this check should not be done in microtask[1]. We make this checking
>+        part as a macrotask. We note that algorithm noted as FIXMEs should be done in this
>+        microtask while the checking part should not be done.
>+
>+        [1]: https://w3c.github.io/ServiceWorker/#installation-algorithm
>+
> 2018-08-03  Sam Weinig  <sam@webkit.org>
> 
>         Remove WebGPUObject
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1c549d38186b03b469f851c541121707f26c973b..5bb091787dfc8658f1269a263b95961b76fa819f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,112 @@
>+2018-08-03  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        Add the support for micro tasks in workers
>+        https://bugs.webkit.org/show_bug.cgi?id=188246
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rename JSMainThreadExecState.h to JSExecState.h.
>+
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentGtk.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementGtk.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeGtk.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.cpp:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.cpp:
>+
> 2018-08-03  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix spelling of "overridden"
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 7f6b25e7238d499806524592873fb67d9d4c30b3..c28716f2a18fde4fde24b564a39723ca1b4009a9 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,129 @@
>+2018-08-03  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        Add the support for micro tasks in workers
>+        https://bugs.webkit.org/show_bug.cgi?id=188246
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rename JSMainThreadExecState.h to JSExecState.h.
>+
>+        * DOM/DOMAttr.mm:
>+        * DOM/DOMBlob.mm:
>+        * DOM/DOMCDATASection.mm:
>+        * DOM/DOMCSSCharsetRule.mm:
>+        * DOM/DOMCSSFontFaceRule.mm:
>+        * DOM/DOMCSSImportRule.mm:
>+        * DOM/DOMCSSMediaRule.mm:
>+        * DOM/DOMCSSPageRule.mm:
>+        * DOM/DOMCSSPrimitiveValue.mm:
>+        * DOM/DOMCSSRule.mm:
>+        * DOM/DOMCSSRuleList.mm:
>+        * DOM/DOMCSSStyleDeclaration.mm:
>+        * DOM/DOMCSSStyleRule.mm:
>+        * DOM/DOMCSSStyleSheet.mm:
>+        * DOM/DOMCSSUnknownRule.mm:
>+        * DOM/DOMCSSValue.mm:
>+        * DOM/DOMCSSValueList.mm:
>+        * DOM/DOMCharacterData.mm:
>+        * DOM/DOMComment.mm:
>+        * DOM/DOMCounter.mm:
>+        * DOM/DOMDocument.mm:
>+        * DOM/DOMDocumentFragment.mm:
>+        * DOM/DOMDocumentType.mm:
>+        * DOM/DOMElement.mm:
>+        * DOM/DOMEvent.mm:
>+        * DOM/DOMFile.mm:
>+        * DOM/DOMFileList.mm:
>+        * DOM/DOMHTML.mm:
>+        * DOM/DOMHTMLAnchorElement.mm:
>+        * DOM/DOMHTMLAppletElement.mm:
>+        * DOM/DOMHTMLAreaElement.mm:
>+        * DOM/DOMHTMLBRElement.mm:
>+        * DOM/DOMHTMLBaseElement.mm:
>+        * DOM/DOMHTMLBaseFontElement.mm:
>+        * DOM/DOMHTMLBodyElement.mm:
>+        * DOM/DOMHTMLButtonElement.mm:
>+        * DOM/DOMHTMLCanvasElement.mm:
>+        * DOM/DOMHTMLCollection.mm:
>+        * DOM/DOMHTMLDListElement.mm:
>+        * DOM/DOMHTMLDirectoryElement.mm:
>+        * DOM/DOMHTMLDivElement.mm:
>+        * DOM/DOMHTMLDocument.mm:
>+        * DOM/DOMHTMLElement.mm:
>+        * DOM/DOMHTMLEmbedElement.mm:
>+        * DOM/DOMHTMLFieldSetElement.mm:
>+        * DOM/DOMHTMLFontElement.mm:
>+        * DOM/DOMHTMLFormElement.mm:
>+        * DOM/DOMHTMLFrameElement.mm:
>+        * DOM/DOMHTMLFrameSetElement.mm:
>+        * DOM/DOMHTMLHRElement.mm:
>+        * DOM/DOMHTMLHeadElement.mm:
>+        * DOM/DOMHTMLHeadingElement.mm:
>+        * DOM/DOMHTMLHtmlElement.mm:
>+        * DOM/DOMHTMLIFrameElement.mm:
>+        * DOM/DOMHTMLImageElement.mm:
>+        * DOM/DOMHTMLInputElement.mm:
>+        * DOM/DOMHTMLLIElement.mm:
>+        * DOM/DOMHTMLLabelElement.mm:
>+        * DOM/DOMHTMLLegendElement.mm:
>+        * DOM/DOMHTMLLinkElement.mm:
>+        * DOM/DOMHTMLMapElement.mm:
>+        * DOM/DOMHTMLMarqueeElement.mm:
>+        * DOM/DOMHTMLMediaElement.mm:
>+        * DOM/DOMHTMLMenuElement.mm:
>+        * DOM/DOMHTMLMetaElement.mm:
>+        * DOM/DOMHTMLModElement.mm:
>+        * DOM/DOMHTMLOListElement.mm:
>+        * DOM/DOMHTMLObjectElement.mm:
>+        * DOM/DOMHTMLOptGroupElement.mm:
>+        * DOM/DOMHTMLOptionElement.mm:
>+        * DOM/DOMHTMLOptionsCollection.mm:
>+        * DOM/DOMHTMLParagraphElement.mm:
>+        * DOM/DOMHTMLParamElement.mm:
>+        * DOM/DOMHTMLPreElement.mm:
>+        * DOM/DOMHTMLQuoteElement.mm:
>+        * DOM/DOMHTMLScriptElement.mm:
>+        * DOM/DOMHTMLSelectElement.mm:
>+        * DOM/DOMHTMLStyleElement.mm:
>+        * DOM/DOMHTMLTableCaptionElement.mm:
>+        * DOM/DOMHTMLTableCellElement.mm:
>+        * DOM/DOMHTMLTableColElement.mm:
>+        * DOM/DOMHTMLTableElement.mm:
>+        * DOM/DOMHTMLTableRowElement.mm:
>+        * DOM/DOMHTMLTableSectionElement.mm:
>+        * DOM/DOMHTMLTextAreaElement.mm:
>+        * DOM/DOMHTMLTitleElement.mm:
>+        * DOM/DOMHTMLUListElement.mm:
>+        * DOM/DOMHTMLVideoElement.mm:
>+        * DOM/DOMImplementation.mm:
>+        * DOM/DOMKeyboardEvent.mm:
>+        * DOM/DOMMediaError.mm:
>+        * DOM/DOMMediaList.mm:
>+        * DOM/DOMMouseEvent.mm:
>+        * DOM/DOMMutationEvent.mm:
>+        * DOM/DOMNamedNodeMap.mm:
>+        * DOM/DOMNode.mm:
>+        * DOM/DOMNodeIterator.mm:
>+        * DOM/DOMNodeList.mm:
>+        * DOM/DOMOverflowEvent.mm:
>+        * DOM/DOMProcessingInstruction.mm:
>+        * DOM/DOMProgressEvent.mm:
>+        * DOM/DOMRGBColor.mm:
>+        * DOM/DOMRange.mm:
>+        * DOM/DOMRect.mm:
>+        * DOM/DOMStyleSheet.mm:
>+        * DOM/DOMStyleSheetList.mm:
>+        * DOM/DOMText.mm:
>+        * DOM/DOMTextEvent.mm:
>+        * DOM/DOMTimeRanges.mm:
>+        * DOM/DOMTokenList.mm:
>+        * DOM/DOMTreeWalker.mm:
>+        * DOM/DOMUIEvent.mm:
>+        * DOM/DOMWheelEvent.mm:
>+        * DOM/DOMXPathExpression.mm:
>+        * DOM/DOMXPathResult.mm:
>+        * DOM/ObjCEventListener.mm:
>+
> 2018-08-03  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix spelling of "overridden"
>diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp b/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp
>index 18f0d7ca8208f460e7d4d131e95f3c0f58f29a76..476d2e5e377a59400a6554262587758a7ee972f2 100644
>--- a/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp
>+++ b/Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "LegacyCDMSessionClearKey.h"
> 
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "Logging.h"
> #include "TextEncoding.h"
> #include "WebKitMediaKeyError.h"
>diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
>index 47e70e1d0d2aab3eae1ed78963ed87e5f3a3a173..30fcf395f837db6be5cf2665226bc7f4fe0b3a9c 100644
>--- a/Source/WebCore/Sources.txt
>+++ b/Source/WebCore/Sources.txt
>@@ -401,6 +401,7 @@ bindings/js/JSErrorHandler.cpp
> bindings/js/JSEventCustom.cpp
> bindings/js/JSEventListener.cpp
> bindings/js/JSEventTargetCustom.cpp
>+bindings/js/JSExecState.cpp
> bindings/js/JSExtendableMessageEventCustom.cpp
> bindings/js/JSFetchEventCustom.cpp
> bindings/js/JSFileSystemEntryCustom.cpp
>@@ -417,7 +418,6 @@ bindings/js/JSIDBTransactionCustom.cpp
> bindings/js/JSImageDataCustom.cpp
> bindings/js/JSLazyEventListener.cpp
> bindings/js/JSLocationCustom.cpp
>-bindings/js/JSMainThreadExecState.cpp
> bindings/js/JSMediaStreamTrackCustom.cpp
> bindings/js/JSMessageChannelCustom.cpp
> bindings/js/JSMessageEventCustom.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index ca0a70cd7d7c68774b917d355ac28d7aeafce24a..03e434f5525025a0e04e8340ad81b2d01b8dcbca 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -2617,7 +2617,7 @@
> 		93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF0260AF6C52900018E89 /* NavigationAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93D196311D6CAB7600FC7E47 /* ExceptionOr.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D196301D6CAB7600FC7E47 /* ExceptionOr.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93D196331D6CAB8200FC7E47 /* Exception.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D196321D6CAB8200FC7E47 /* Exception.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		93D4379F1D57B15300AB85EA /* JSMainThreadExecState.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		93D4379F1D57B15300AB85EA /* JSExecState.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F934D831189F1EE00508D5D /* JSExecState.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93D437A01D57B19A00AB85EA /* CustomElementReactionQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B56C9A81C89312800C456DF /* CustomElementReactionQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93D437A11D57B3F400AB85EA /* ElementDescendantIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = ADE11F4A18D8311B0078983B /* ElementDescendantIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93D437A21D57B3FE00AB85EA /* URLUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 656B9DCA189DE10000BB842C /* URLUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -4692,6 +4692,7 @@
> 		E3B2F0EE1D7F4CA900B0C9D1 /* LoadableScriptClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E3B2F0E81D7F35EC00B0C9D1 /* LoadableScriptClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E3B2F0F01D7F4CB500B0C9D1 /* LoadableClassicScript.h in Headers */ = {isa = PBXBuildFile; fileRef = E3B2F0E41D7F35EC00B0C9D1 /* LoadableClassicScript.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E3C99A091DC3D41C00794AD3 /* DOMJITCheckDOM.h in Headers */ = {isa = PBXBuildFile; fileRef = E3C99A081DC3D41700794AD3 /* DOMJITCheckDOM.h */; };
>+		E3C9AECB2113149900419B92 /* JSMicrotaskCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = E3C9AEC92113147400419B92 /* JSMicrotaskCallback.h */; };
> 		E3E4E2A81E3B17100023BB8A /* ScriptElementCachedScriptFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E3E4E2A61E3B16FC0023BB8A /* ScriptElementCachedScriptFetcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E3FA38641D71812D00AA5950 /* PendingScriptClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E3FA38611D716E7600AA5950 /* PendingScriptClient.h */; };
> 		E401C27517CE53EC00C41A35 /* ElementIteratorAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -10215,8 +10216,8 @@
> 		8E620E8020EE5FFC007BC5EF /* VRPlatformDisplayClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VRPlatformDisplayClient.h; sourceTree = "<group>"; };
> 		8EC6C961201A250100FBFA53 /* GapLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GapLength.h; sourceTree = "<group>"; };
> 		8F6756191288B17B0047ACA3 /* EventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventQueue.h; sourceTree = "<group>"; };
>-		8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMainThreadExecState.h; sourceTree = "<group>"; };
>-		8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMainThreadExecState.cpp; sourceTree = "<group>"; };
>+		8F934D831189F1EE00508D5D /* JSExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExecState.h; sourceTree = "<group>"; };
>+		8F934D841189F1EE00508D5D /* JSExecState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSExecState.cpp; sourceTree = "<group>"; };
> 		9001773D12E0347800648462 /* OESStandardDerivatives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OESStandardDerivatives.cpp; sourceTree = "<group>"; };
> 		9001773E12E0347800648462 /* OESStandardDerivatives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OESStandardDerivatives.h; sourceTree = "<group>"; };
> 		9001773F12E0347800648462 /* OESStandardDerivatives.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OESStandardDerivatives.idl; sourceTree = "<group>"; };
>@@ -12536,7 +12537,7 @@
> 		B543B85617EB758F003BE93A /* SVGPropertyInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPropertyInfo.cpp; sourceTree = "<group>"; };
> 		B562DB5E17D3CD560010AF96 /* HTMLElementTypeHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HTMLElementTypeHelpers.h; sourceTree = "<group>"; };
> 		B562DB5F17D3CD560010AF96 /* SVGElementTypeHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGElementTypeHelpers.h; sourceTree = "<group>"; };
>-		B56576E417DA599F00A56BDC /* JSMainThreadExecStateInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMainThreadExecStateInstrumentation.h; sourceTree = "<group>"; };
>+		B56576E417DA599F00A56BDC /* JSExecStateInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExecStateInstrumentation.h; sourceTree = "<group>"; };
> 		B56579B41824D12A00E79F23 /* RenderChildIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderChildIterator.h; sourceTree = "<group>"; };
> 		B57CB52B182A37F60079A647 /* InlineElementBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineElementBox.h; sourceTree = "<group>"; };
> 		B57CB52C182A3EED0079A647 /* InlineElementBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InlineElementBox.cpp; sourceTree = "<group>"; };
>@@ -14312,6 +14313,7 @@
> 		E3B2F0E91D7F3D3C00B0C9D1 /* LoadableScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadableScript.cpp; sourceTree = "<group>"; };
> 		E3B7C0621DC3415A001FB0B8 /* JSDocumentDOMJIT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDocumentDOMJIT.cpp; sourceTree = "<group>"; };
> 		E3C99A081DC3D41700794AD3 /* DOMJITCheckDOM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMJITCheckDOM.h; sourceTree = "<group>"; };
>+		E3C9AEC92113147400419B92 /* JSMicrotaskCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMicrotaskCallback.h; sourceTree = "<group>"; };
> 		E3D049931DADC04500718F3C /* NodeConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeConstants.h; sourceTree = "<group>"; };
> 		E3E4E2A51E3B16FC0023BB8A /* ScriptElementCachedScriptFetcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptElementCachedScriptFetcher.cpp; sourceTree = "<group>"; };
> 		E3E4E2A61E3B16FC0023BB8A /* ScriptElementCachedScriptFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptElementCachedScriptFetcher.h; sourceTree = "<group>"; };
>@@ -16529,6 +16531,7 @@
> 				A409C983116D0DDD007197BD /* AccessibilityProgressIndicator.h */,
> 				2981CAA6131822EC00D12F2A /* AccessibilityRenderObject.cpp */,
> 				29A8121B0FBB9C1D00510293 /* AccessibilityRenderObject.h */,
>+				A9EE448F210FD69A00B6EAE6 /* AccessibilityRole.idl */,
> 				2981CAA7131822EC00D12F2A /* AccessibilityScrollbar.cpp */,
> 				93C4F6E91108F9A50099D0DB /* AccessibilityScrollbar.h */,
> 				2981CAA8131822EC00D12F2A /* AccessibilityScrollView.cpp */,
>@@ -16558,7 +16561,6 @@
> 				A9F2E0E720475CDC00512855 /* AccessibleSetValueEvent.cpp */,
> 				A9F2E0E820475CDC00512855 /* AccessibleSetValueEvent.h */,
> 				A9F2E0E920475CDE00512855 /* AccessibleSetValueEvent.idl */,
>-				A9EE448F210FD69A00B6EAE6 /* AccessibilityRole.idl */,
> 				A9EE448C210FC9AD00B6EAE6 /* AriaAttributes.idl */,
> 				2981CAAF131822EC00D12F2A /* AXObjectCache.cpp */,
> 				29A8121A0FBB9C1D00510293 /* AXObjectCache.h */,
>@@ -23991,9 +23993,10 @@
> 				65E0E9431133C89F00B4CB10 /* JSDOMWrapper.h */,
> 				7C45C9CB1E3E8E4900AAB558 /* JSDOMWrapperCache.cpp */,
> 				7C45C9C81E3E8B5100AAB558 /* JSDOMWrapperCache.h */,
>-				8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */,
>-				8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */,
>-				B56576E417DA599F00A56BDC /* JSMainThreadExecStateInstrumentation.h */,
>+				8F934D841189F1EE00508D5D /* JSExecState.cpp */,
>+				8F934D831189F1EE00508D5D /* JSExecState.h */,
>+				B56576E417DA599F00A56BDC /* JSExecStateInstrumentation.h */,
>+				E3C9AEC92113147400419B92 /* JSMicrotaskCallback.h */,
> 				93B70D4F09EB0C7C009D8468 /* JSPluginElementFunctions.cpp */,
> 				93B70D5009EB0C7C009D8468 /* JSPluginElementFunctions.h */,
> 				4129DF831BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.cpp */,
>@@ -27866,7 +27869,6 @@
> 				8371AC3B1F509BE400FBF284 /* ErrorCallback.h in Headers */,
> 				2ECF7AE210162B5800427DE7 /* ErrorEvent.h in Headers */,
> 				85031B420A44EFC700F992E0 /* Event.h in Headers */,
>-				CD227E3A2113C86200D285AF /* MediaSessionManagerCocoa.h in Headers */,
> 				4138D3351244054800323D33 /* EventContext.h in Headers */,
> 				418A06D0133C04D500CD379C /* EventDispatcher.h in Headers */,
> 				93C09A530B064DB3005ABD4D /* EventHandler.h in Headers */,
>@@ -28662,6 +28664,7 @@
> 				E0FEF372B37C53EAC1C1FBEE /* JSEventSource.h in Headers */,
> 				5FC7DC26CFE2563200B85AE4 /* JSEventTarget.h in Headers */,
> 				46B63F6C1C6E8D19002E914B /* JSEventTargetCustom.h in Headers */,
>+				93D4379F1D57B15300AB85EA /* JSExecState.h in Headers */,
> 				724ED3321A3A8B2300F5F13C /* JSEXTBlendMinMax.h in Headers */,
> 				7E4C96DD1AD4483500365A53 /* JSExtendableEvent.h in Headers */,
> 				83102B271F9EADD900E404B9 /* JSExtendableMessageEvent.h in Headers */,
>@@ -28814,7 +28817,6 @@
> 				935F45430F7C3B5F00D7C1FB /* JSLazyEventListener.h in Headers */,
> 				BCE1C43C0D9830D3003B02F2 /* JSLocation.h in Headers */,
> 				93A806201E03B585008A1F26 /* JSLongRange.h in Headers */,
>-				93D4379F1D57B15300AB85EA /* JSMainThreadExecState.h in Headers */,
> 				CDAB6D2E17C814EE00C60B34 /* JSMediaControlsHost.h in Headers */,
> 				159741DB1B7D140100201C92 /* JSMediaDeviceInfo.h in Headers */,
> 				15739BBB1B42012D00D258C1 /* JSMediaDevices.h in Headers */,
>@@ -28847,6 +28849,7 @@
> 				E107400E0E77BDC00033AF24 /* JSMessageChannel.h in Headers */,
> 				75793EC90D0CE72D007FC0AC /* JSMessageEvent.h in Headers */,
> 				E1ADEDDA0E76BD93004A1A5E /* JSMessagePort.h in Headers */,
>+				E3C9AECB2113149900419B92 /* JSMicrotaskCallback.h in Headers */,
> 				A86629D109DA2B48009633A5 /* JSMouseEvent.h in Headers */,
> 				830A36BD1DAC5FAD006D7D09 /* JSMouseEventInit.h in Headers */,
> 				65DF31FC09D1CC60000BE325 /* JSMutationEvent.h in Headers */,
>@@ -29448,6 +29451,7 @@
> 				C96F5EC81B5872260091EA9D /* MediaSessionInterruptionProvider.h in Headers */,
> 				C96F5EC51B5872260091EA9D /* MediaSessionInterruptionProviderMac.h in Headers */,
> 				C90F65561B2253BE002163A1 /* MediaSessionManager.h in Headers */,
>+				CD227E3A2113C86200D285AF /* MediaSessionManagerCocoa.h in Headers */,
> 				07638A991884487200E15A1B /* MediaSessionManagerIOS.h in Headers */,
> 				C9D851F01B39DC780085062E /* MediaSessionMetadata.h in Headers */,
> 				CD3A495F17A9D01B00274E42 /* MediaSource.h in Headers */,
>diff --git a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>index 8166c761a0f8f5dbcce54305b72b3488787d9c8d..f6d975624f37ed6f79a0e23b96d90ba8be5a7fdb 100644
>--- a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>+++ b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>@@ -62,6 +62,7 @@
> #include "JSEventCustom.cpp"
> #include "JSEventListener.cpp"
> #include "JSEventTargetCustom.cpp"
>+#include "JSExecState.cpp"
> #include "JSExtendableMessageEventCustom.cpp"
> #include "JSFileSystemEntryCustom.cpp"
> #include "JSHTMLCollectionCustom.cpp"
>@@ -72,7 +73,6 @@
> #include "JSImageDataCustom.cpp"
> #include "JSLazyEventListener.cpp"
> #include "JSLocationCustom.cpp"
>-#include "JSMainThreadExecState.cpp"
> #include "JSMediaStreamTrackCustom.cpp"
> #include "JSMessageChannelCustom.cpp"
> #include "JSMessageEventCustom.cpp"
>diff --git a/Source/WebCore/bindings/js/JSCallbackData.cpp b/Source/WebCore/bindings/js/JSCallbackData.cpp
>index 90a837eeaadd6774655b8635db81dbe2c15304b4..9ba0eaf19faddc1c4be1a530aeb447dcb39eef1f 100644
>--- a/Source/WebCore/bindings/js/JSCallbackData.cpp
>+++ b/Source/WebCore/bindings/js/JSCallbackData.cpp
>@@ -31,8 +31,8 @@
> 
> #include "Document.h"
> #include "JSDOMBinding.h"
>-#include "JSMainThreadExecState.h"
>-#include "JSMainThreadExecStateInstrumentation.h"
>+#include "JSExecState.h"
>+#include "JSExecStateInstrumentation.h"
> #include <JavaScriptCore/Exception.h>
> 
> namespace WebCore {
>@@ -75,12 +75,10 @@ JSValue JSCallbackData::invokeCallback(JSDOMGlobalObject& globalObject, JSObject
>     if (!context)
>         return JSValue();
> 
>-    InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(context, callType, callData);
>+    InspectorInstrumentationCookie cookie = JSExecState::instrumentFunctionCall(context, callType, callData);
> 
>     returnedException = nullptr;
>-    JSValue result = context->isDocument()
>-        ? JSMainThreadExecState::profiledCall(exec, JSC::ProfilingReason::Other, function, callType, callData, thisValue, args, returnedException)
>-        : JSC::profiledCall(exec, JSC::ProfilingReason::Other, function, callType, callData, thisValue, args, returnedException);
>+    JSValue result = JSExecState::profiledCall(exec, JSC::ProfilingReason::Other, function, callType, callData, thisValue, args, returnedException);
> 
>     InspectorInstrumentation::didCallFunction(cookie, context);
> 
>diff --git a/Source/WebCore/bindings/js/JSCustomElementInterface.cpp b/Source/WebCore/bindings/js/JSCustomElementInterface.cpp
>index f10815fb96e176a44f8ea2157d6e8edeffbfb572..ec172a469a2a33a8e381074dcd7d78e35da82167 100644
>--- a/Source/WebCore/bindings/js/JSCustomElementInterface.cpp
>+++ b/Source/WebCore/bindings/js/JSCustomElementInterface.cpp
>@@ -35,9 +35,9 @@
> #include "JSDOMConvertStrings.h"
> #include "JSDOMWindow.h"
> #include "JSElement.h"
>+#include "JSExecState.h"
>+#include "JSExecStateInstrumentation.h"
> #include "JSHTMLElement.h"
>-#include "JSMainThreadExecState.h"
>-#include "JSMainThreadExecStateInstrumentation.h"
> #include "ScriptExecutionContext.h"
> #include <JavaScriptCore/JSLock.h>
> #include <JavaScriptCore/WeakInlines.h>
>@@ -124,7 +124,7 @@ static RefPtr<Element> constructCustomElementSynchronously(Document& document, V
>         return nullptr;
>     }
> 
>-    InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionConstruct(&document, constructType, constructData);
>+    InspectorInstrumentationCookie cookie = JSExecState::instrumentFunctionConstruct(&document, constructType, constructData);
>     MarkedArgumentBuffer args;
>     ASSERT(!args.hasOverflowed());
>     JSValue newElement = construct(&state, constructor, constructType, constructData, args);
>@@ -199,7 +199,7 @@ void JSCustomElementInterface::upgradeElement(Element& element)
> 
>     MarkedArgumentBuffer args;
>     ASSERT(!args.hasOverflowed());
>-    InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionConstruct(context, constructType, constructData);
>+    InspectorInstrumentationCookie cookie = JSExecState::instrumentFunctionConstruct(context, constructType, constructData);
>     JSValue returnedElement = construct(state, m_constructor.get(), constructType, constructData, args);
>     InspectorInstrumentation::didCallFunction(cookie, context);
> 
>@@ -248,10 +248,10 @@ void JSCustomElementInterface::invokeCallback(Element& element, JSObject* callba
>     addArguments(state, globalObject, args);
>     RELEASE_ASSERT(!args.hasOverflowed());
> 
>-    InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(context, callType, callData);
>+    InspectorInstrumentationCookie cookie = JSExecState::instrumentFunctionCall(context, callType, callData);
> 
>     NakedPtr<JSC::Exception> exception;
>-    JSMainThreadExecState::call(state, callback, callType, callData, jsElement, args, exception);
>+    JSExecState::call(state, callback, callType, callData, jsElement, args, exception);
> 
>     InspectorInstrumentation::didCallFunction(cookie, context);
> 
>diff --git a/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp b/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
>index 76a662f85e4724f02cb0f9b220fd09c1efaeba92..21acf02d0f2e3af533630c860a8c58d323d338a7 100644
>--- a/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
>+++ b/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
>@@ -32,7 +32,7 @@
> #include "Frame.h"
> #include "JSDOMExceptionHandling.h"
> #include "JSDOMWindowCustom.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "Page.h"
> #include "PageConsoleClient.h"
> #include <JavaScriptCore/JSLock.h>
>@@ -91,7 +91,7 @@ String JSCustomXPathNSResolver::lookupNamespaceURI(const String& prefix)
>     ASSERT(!args.hasOverflowed());
> 
>     NakedPtr<JSC::Exception> exception;
>-    JSValue retval = JSMainThreadExecState::call(exec, function, callType, callData, m_customResolver.get(), args, exception);
>+    JSValue retval = JSExecState::call(exec, function, callType, callData, m_customResolver.get(), args, exception);
> 
>     String result;
>     if (exception)
>diff --git a/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp b/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp
>index 664ec33056b6e36204bb96208836951ab86e18ae..9fc306cce0fa3e8a85c7cfee0da13638850d8715 100644
>--- a/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp
>+++ b/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp
>@@ -28,7 +28,7 @@
> 
> #include "ActiveDOMCallback.h"
> #include "JSDOMGlobalObject.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include <JavaScriptCore/Microtask.h>
> #include <JavaScriptCore/StrongInlines.h>
> #include <wtf/Ref.h>
>@@ -59,13 +59,7 @@ class JSGlobalObjectCallback final : public RefCounted<JSGlobalObjectCallback>,
>         // We will fail to get the context if the frame has been detached.
>         if (!context)
>             return;
>-
>-        // 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::runTask(exec, m_task);
>-        else
>-            m_task->run(exec);
>+        JSExecState::runTask(exec, m_task);
>         scope.assertNoException();
>     }
> 
>diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>index f4d8cf325fbdf9ada3eb4e318f8bdca25e30d3ae..22228224e5818c7cc78f39ad6a94e143488b886f 100644
>--- a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>+++ b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>@@ -36,7 +36,7 @@
> #include "JSDOMGlobalObjectTask.h"
> #include "JSDOMWindowCustom.h"
> #include "JSFetchResponse.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSMicrotaskCallback.h"
> #include "JSNode.h"
> #include "Logging.h"
> #include "Page.h"
>@@ -205,43 +205,11 @@ RuntimeFlags JSDOMWindowBase::javaScriptRuntimeFlags(const JSGlobalObject* objec
>     return frame->settings().javaScriptRuntimeFlags();
> }
> 
>-class JSDOMWindowMicrotaskCallback : public RefCounted<JSDOMWindowMicrotaskCallback> {
>-public:
>-    static Ref<JSDOMWindowMicrotaskCallback> create(JSDOMWindowBase& globalObject, Ref<JSC::Microtask>&& task)
>-    {
>-        return adoptRef(*new JSDOMWindowMicrotaskCallback(globalObject, WTFMove(task)));
>-    }
>-
>-    void call()
>-    {
>-        Ref<JSDOMWindowMicrotaskCallback> protectedThis(*this);
>-        VM& vm = m_globalObject->vm();
>-        JSLockHolder lock(vm);
>-        auto scope = DECLARE_THROW_SCOPE(vm);
>-
>-        ExecState* exec = m_globalObject->globalExec();
>-
>-        JSMainThreadExecState::runTask(exec, m_task);
>-
>-        scope.assertNoException();
>-    }
>-
>-private:
>-    JSDOMWindowMicrotaskCallback(JSDOMWindowBase& globalObject, Ref<JSC::Microtask>&& task)
>-        : m_globalObject { globalObject.vm(), &globalObject }
>-        , m_task { WTFMove(task) }
>-    {
>-    }
>-
>-    Strong<JSDOMWindowBase> m_globalObject;
>-    Ref<JSC::Microtask> m_task;
>-};
>-
> void JSDOMWindowBase::queueTaskToEventLoop(JSGlobalObject& object, Ref<JSC::Microtask>&& task)
> {
>     JSDOMWindowBase& thisObject = static_cast<JSDOMWindowBase&>(object);
> 
>-    RefPtr<JSDOMWindowMicrotaskCallback> callback = JSDOMWindowMicrotaskCallback::create(thisObject, WTFMove(task));
>+    RefPtr<JSMicrotaskCallback> callback = JSMicrotaskCallback::create(thisObject, WTFMove(task));
>     auto microtask = std::make_unique<ActiveDOMCallbackMicrotask>(MicrotaskQueue::mainThreadQueue(), *thisObject.scriptExecutionContext(), [callback]() mutable {
>         callback->call();
>     });
>diff --git a/Source/WebCore/bindings/js/JSErrorHandler.cpp b/Source/WebCore/bindings/js/JSErrorHandler.cpp
>index f72e1851a42304a92ee5d163d97c210aa60fb117..4291989cea17bc230516fb4b85c774f8d1cd9fd7 100644
>--- a/Source/WebCore/bindings/js/JSErrorHandler.cpp
>+++ b/Source/WebCore/bindings/js/JSErrorHandler.cpp
>@@ -38,8 +38,8 @@
> #include "JSDOMConvertNumbers.h"
> #include "JSDOMConvertStrings.h"
> #include "JSEvent.h"
>-#include "JSMainThreadExecState.h"
>-#include "JSMainThreadExecStateInstrumentation.h"
>+#include "JSExecState.h"
>+#include "JSExecStateInstrumentation.h"
> #include <JavaScriptCore/JSLock.h>
> #include <JavaScriptCore/VMEntryScope.h>
> #include <wtf/Ref.h>
>@@ -99,12 +99,10 @@ void JSErrorHandler::handleEvent(ScriptExecutionContext& scriptExecutionContext,
>         VM& vm = globalObject->vm();
>         VMEntryScope entryScope(vm, vm.entryScope ? vm.entryScope->globalObject() : globalObject);
> 
>-        InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(&scriptExecutionContext, callType, callData);
>+        InspectorInstrumentationCookie cookie = JSExecState::instrumentFunctionCall(&scriptExecutionContext, callType, callData);
> 
>         NakedPtr<JSC::Exception> exception;
>-        JSValue returnValue = scriptExecutionContext.isDocument()
>-            ? JSMainThreadExecState::profiledCall(exec, JSC::ProfilingReason::Other, jsFunction, callType, callData, globalObject, args, exception)
>-            : JSC::profiledCall(exec, JSC::ProfilingReason::Other, jsFunction, callType, callData, globalObject, args, exception);
>+        JSValue returnValue = JSExecState::profiledCall(exec, JSC::ProfilingReason::Other, jsFunction, callType, callData, globalObject, args, exception);
> 
>         InspectorInstrumentation::didCallFunction(cookie, &scriptExecutionContext);
> 
>diff --git a/Source/WebCore/bindings/js/JSEventListener.cpp b/Source/WebCore/bindings/js/JSEventListener.cpp
>index a015d7ef0aa4bc6b33f5b09e90801dc1abe21066..9931fe8b1abcb640a85970b4bb9ea3ad186e803b 100644
>--- a/Source/WebCore/bindings/js/JSEventListener.cpp
>+++ b/Source/WebCore/bindings/js/JSEventListener.cpp
>@@ -30,8 +30,8 @@
> #include "JSDocument.h"
> #include "JSEvent.h"
> #include "JSEventTarget.h"
>-#include "JSMainThreadExecState.h"
>-#include "JSMainThreadExecStateInstrumentation.h"
>+#include "JSExecState.h"
>+#include "JSExecStateInstrumentation.h"
> #include "JSWorkerGlobalScope.h"
> #include "ScriptController.h"
> #include "WorkerGlobalScope.h"
>@@ -165,13 +165,11 @@ void JSEventListener::handleEvent(ScriptExecutionContext& scriptExecutionContext
> 
>         VMEntryScope entryScope(vm, vm.entryScope ? vm.entryScope->globalObject() : globalObject);
> 
>-        InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(&scriptExecutionContext, callType, callData);
>+        InspectorInstrumentationCookie cookie = JSExecState::instrumentFunctionCall(&scriptExecutionContext, callType, callData);
> 
>         JSValue thisValue = handleEventFunction == jsFunction ? toJS(exec, globalObject, event.currentTarget()) : jsFunction;
>         NakedPtr<JSC::Exception> exception;
>-        JSValue retval = scriptExecutionContext.isDocument()
>-            ? JSMainThreadExecState::profiledCall(exec, JSC::ProfilingReason::Other, handleEventFunction, callType, callData, thisValue, args, exception)
>-            : JSC::profiledCall(exec, JSC::ProfilingReason::Other, handleEventFunction, callType, callData, thisValue, args, exception);
>+        JSValue retval = JSExecState::profiledCall(exec, JSC::ProfilingReason::Other, handleEventFunction, callType, callData, thisValue, args, exception);
> 
>         InspectorInstrumentation::didCallFunction(cookie, &scriptExecutionContext);
> 
>diff --git a/Source/WebCore/bindings/js/JSExecState.cpp b/Source/WebCore/bindings/js/JSExecState.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..d784c84bab22bb9f681f723f340ad795eab7f08e
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/JSExecState.cpp
>@@ -0,0 +1,65 @@
>+/*
>+ * Copyright (C) 2010 Google Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "JSExecState.h"
>+
>+#include "Microtasks.h"
>+#include "RejectedPromiseTracker.h"
>+#include "ScriptExecutionContext.h"
>+#include "ScriptState.h"
>+#include "WorkerGlobalScope.h"
>+
>+namespace WebCore {
>+
>+void JSExecState::didLeaveScriptContext(JSC::ExecState* exec)
>+{
>+    // While main thread has many ScriptExecutionContexts, WorkerGlobalScope and worker thread have
>+    // one on one correspondence. The lifetime of MicrotaskQueue is aligned to this semantics.
>+    // While main thread MicrotaskQueue is persistently held, worker's MicrotaskQueue is held by
>+    // WorkerGlobalScope.
>+    ScriptExecutionContext* context = scriptExecutionContextFromExecState(exec);
>+    if (isMainThread()) {
>+        MicrotaskQueue::mainThreadQueue().performMicrotaskCheckpoint();
>+        // FIXME: Promise rejection tracker is available only in non-worker environment.
>+        // https://bugs.webkit.org/show_bug.cgi?id=188265
>+        context->ensureRejectedPromiseTracker().processQueueSoon();
>+    } else {
>+        ASSERT(context->isWorkerGlobalScope());
>+        static_cast<WorkerGlobalScope*>(context)->microtaskQueue().performMicrotaskCheckpoint();
>+    }
>+}
>+
>+JSC::JSValue functionCallHandlerFromAnyThread(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException)
>+{
>+    return JSExecState::call(exec, functionObject, callType, callData, thisValue, args, returnedException);
>+}
>+
>+JSC::JSValue evaluateHandlerFromAnyThread(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException)
>+{
>+    return JSExecState::evaluate(exec, source, thisValue, returnedException);
>+}
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/JSExecState.h b/Source/WebCore/bindings/js/JSExecState.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..27c5721e2d8f008a2cb719aa37fcad8643a30b60
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/JSExecState.h
>@@ -0,0 +1,189 @@
>+/*
>+ * Copyright (C) 2010 Google Inc. All rights reserved.
>+ * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#include "CustomElementReactionQueue.h"
>+#include "JSDOMBinding.h"
>+#include "ThreadGlobalData.h"
>+#include <JavaScriptCore/CatchScope.h>
>+#include <JavaScriptCore/Completion.h>
>+#include <JavaScriptCore/Microtask.h>
>+#include <wtf/ForbidHeapAllocation.h>
>+#include <wtf/MainThread.h>
>+
>+namespace WebCore {
>+
>+class InspectorInstrumentationCookie;
>+class ScriptExecutionContext;
>+
>+class JSExecState {
>+    WTF_MAKE_NONCOPYABLE(JSExecState);
>+    WTF_FORBID_HEAP_ALLOCATION;
>+    friend class JSMainThreadNullState;
>+public:
>+    static JSC::ExecState* currentState()
>+    {
>+        return threadGlobalData().currentState();
>+    };
>+    
>+    static JSC::JSValue call(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException)
>+    {
>+        JSExecState currentState(exec);
>+        return JSC::call(exec, functionObject, callType, callData, thisValue, args, returnedException);
>+    };
>+
>+    static JSC::JSValue evaluate(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException)
>+    {
>+        JSExecState currentState(exec);
>+        return JSC::evaluate(exec, source, thisValue, returnedException);
>+    };
>+
>+    static JSC::JSValue evaluate(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue = JSC::JSValue())
>+    {
>+        NakedPtr<JSC::Exception> unused;
>+        return evaluate(exec, source, thisValue, unused);
>+    };
>+
>+    static JSC::JSValue profiledCall(JSC::ExecState* exec, JSC::ProfilingReason reason, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException)
>+    {
>+        JSExecState currentState(exec);
>+        return JSC::profiledCall(exec, reason, functionObject, callType, callData, thisValue, args, returnedException);
>+    }
>+
>+    static JSC::JSValue profiledEvaluate(JSC::ExecState* exec, JSC::ProfilingReason reason, const JSC::SourceCode& source, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException)
>+    {
>+        JSExecState currentState(exec);
>+        return JSC::profiledEvaluate(exec, reason, source, thisValue, returnedException);
>+    }
>+
>+    static JSC::JSValue profiledEvaluate(JSC::ExecState* exec, JSC::ProfilingReason reason, const JSC::SourceCode& source, JSC::JSValue thisValue = JSC::JSValue())
>+    {
>+        NakedPtr<JSC::Exception> unused;
>+        return profiledEvaluate(exec, reason, source, thisValue, unused);
>+    }
>+
>+    static void runTask(JSC::ExecState* exec, JSC::Microtask& task)
>+    {
>+        JSExecState currentState(exec);
>+        task.run(exec);
>+    }
>+
>+    static JSC::JSInternalPromise& loadModule(JSC::ExecState& state, const String& moduleName, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
>+    {
>+        JSExecState currentState(&state);
>+        return *JSC::loadModule(&state, moduleName, parameters, scriptFetcher);
>+    }
>+
>+    static JSC::JSInternalPromise& loadModule(JSC::ExecState& state, const JSC::SourceCode& sourceCode, JSC::JSValue scriptFetcher)
>+    {
>+        JSExecState currentState(&state);
>+        return *JSC::loadModule(&state, sourceCode, scriptFetcher);
>+    }
>+
>+    static JSC::JSValue linkAndEvaluateModule(JSC::ExecState& state, const JSC::Identifier& moduleKey, JSC::JSValue scriptFetcher, NakedPtr<JSC::Exception>& returnedException)
>+    {
>+        JSC::VM& vm = state.vm();
>+        auto scope = DECLARE_CATCH_SCOPE(vm);
>+    
>+        JSExecState currentState(&state);
>+        auto returnValue = JSC::linkAndEvaluateModule(&state, moduleKey, scriptFetcher);
>+        if (UNLIKELY(scope.exception())) {
>+            returnedException = scope.exception();
>+            scope.clearException();
>+            return JSC::jsUndefined();
>+        }
>+        return returnValue;
>+    }
>+
>+    static InspectorInstrumentationCookie instrumentFunctionCall(ScriptExecutionContext*, JSC::CallType, const JSC::CallData&);
>+    static InspectorInstrumentationCookie instrumentFunctionConstruct(ScriptExecutionContext*, JSC::ConstructType, const JSC::ConstructData&);
>+
>+private:
>+    explicit JSExecState(JSC::ExecState* exec)
>+        : m_previousState(currentState())
>+        , m_lock(exec)
>+    {
>+        setCurrentState(exec);
>+    };
>+
>+    ~JSExecState()
>+    {
>+        JSC::VM& vm = currentState()->vm();
>+        auto scope = DECLARE_CATCH_SCOPE(vm);
>+        scope.assertNoException();
>+
>+        JSC::ExecState* state = currentState();
>+        bool didExitJavaScript = state && !m_previousState;
>+
>+        setCurrentState(m_previousState);
>+
>+        if (didExitJavaScript)
>+            didLeaveScriptContext(state);
>+    }
>+
>+    static void setCurrentState(JSC::ExecState* state)
>+    {
>+        threadGlobalData().setCurrentState(state);
>+    }
>+
>+    template<typename Type, Type jsType, typename DataType> static InspectorInstrumentationCookie instrumentFunctionInternal(ScriptExecutionContext*, Type, const DataType&);
>+
>+    JSC::ExecState* m_previousState;
>+    JSC::JSLockHolder m_lock;
>+
>+    static void didLeaveScriptContext(JSC::ExecState*);
>+};
>+
>+// Null state prevents origin security checks.
>+// Used by non-JavaScript bindings (ObjC, GObject).
>+class JSMainThreadNullState {
>+    WTF_MAKE_NONCOPYABLE(JSMainThreadNullState);
>+    WTF_FORBID_HEAP_ALLOCATION;
>+public:
>+    explicit JSMainThreadNullState()
>+        : m_previousState(JSExecState::currentState())
>+        , m_customElementReactionStack(m_previousState)
>+    {
>+        ASSERT(isMainThread());
>+        JSExecState::setCurrentState(nullptr);
>+    }
>+
>+    ~JSMainThreadNullState()
>+    {
>+        ASSERT(isMainThread());
>+        JSExecState::setCurrentState(m_previousState);
>+    }
>+
>+private:
>+    JSC::ExecState* m_previousState;
>+    CustomElementReactionStack m_customElementReactionStack;
>+};
>+
>+JSC::JSValue functionCallHandlerFromAnyThread(JSC::ExecState*, JSC::JSValue functionObject, JSC::CallType, const JSC::CallData&, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException);
>+JSC::JSValue evaluateHandlerFromAnyThread(JSC::ExecState*, const JSC::SourceCode&, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException);
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/JSExecStateInstrumentation.h b/Source/WebCore/bindings/js/JSExecStateInstrumentation.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..7a653e5478ff942fae18eb9a810b160161041d35
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/JSExecStateInstrumentation.h
>@@ -0,0 +1,60 @@
>+/*
>+ * Copyright (C) 2010 Google Inc. All rights reserved.
>+ * Copyright (C) 2013 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#include "InspectorInstrumentation.h"
>+#include "JSExecState.h"
>+#include <JavaScriptCore/FunctionExecutable.h>
>+
>+namespace WebCore {
>+
>+template<typename Type, Type jsType, class DataType>
>+inline InspectorInstrumentationCookie JSExecState::instrumentFunctionInternal(ScriptExecutionContext* context, Type callType, const DataType& callData)
>+{
>+    if (!InspectorInstrumentation::timelineAgentEnabled(context))
>+        return InspectorInstrumentationCookie();
>+    String resourceName;
>+    int lineNumber = 1;
>+    if (callType == jsType) {
>+        resourceName = callData.js.functionExecutable->sourceURL();
>+        lineNumber = callData.js.functionExecutable->firstLine();
>+    } else
>+        resourceName = "undefined";
>+    return InspectorInstrumentation::willCallFunction(context, resourceName, lineNumber);
>+}
>+
>+inline InspectorInstrumentationCookie JSExecState::instrumentFunctionCall(ScriptExecutionContext* context, JSC::CallType type, const JSC::CallData& data)
>+{
>+    return instrumentFunctionInternal<JSC::CallType, JSC::CallType::JS, JSC::CallData>(context, type, data);
>+}
>+
>+inline InspectorInstrumentationCookie JSExecState::instrumentFunctionConstruct(ScriptExecutionContext* context, JSC::ConstructType type, const JSC::ConstructData& data)
>+{
>+    return instrumentFunctionInternal<JSC::ConstructType, JSC::ConstructType::JS, JSC::ConstructData>(context, type, data);
>+}
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/JSMainThreadExecState.cpp b/Source/WebCore/bindings/js/JSMainThreadExecState.cpp
>deleted file mode 100644
>index 3f4b06df1c380a1dda35b220b3df61302a93d2b6..0000000000000000000000000000000000000000
>--- a/Source/WebCore/bindings/js/JSMainThreadExecState.cpp
>+++ /dev/null
>@@ -1,58 +0,0 @@
>-/*
>- * Copyright (C) 2010 Google Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "JSMainThreadExecState.h"
>-
>-#include "Microtasks.h"
>-#include "RejectedPromiseTracker.h"
>-#include "ScriptExecutionContext.h"
>-#include "ScriptState.h"
>-
>-namespace WebCore {
>-
>-JSC::ExecState* JSMainThreadExecState::s_mainThreadState = 0;
>-
>-void JSMainThreadExecState::didLeaveScriptContext(JSC::ExecState* exec)
>-{
>-    MicrotaskQueue::mainThreadQueue().performMicrotaskCheckpoint();
>-    scriptExecutionContextFromExecState(exec)->ensureRejectedPromiseTracker().processQueueSoon();
>-}
>-
>-JSC::JSValue functionCallHandlerFromAnyThread(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException)
>-{
>-    if (isMainThread())
>-        return JSMainThreadExecState::call(exec, functionObject, callType, callData, thisValue, args, returnedException);
>-    return JSC::call(exec, functionObject, callType, callData, thisValue, args, returnedException);
>-}
>-
>-JSC::JSValue evaluateHandlerFromAnyThread(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException)
>-{
>-    if (isMainThread())
>-        return JSMainThreadExecState::evaluate(exec, source, thisValue, returnedException);
>-    return JSC::evaluate(exec, source, thisValue, returnedException);
>-}
>-
>-} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/JSMainThreadExecState.h b/Source/WebCore/bindings/js/JSMainThreadExecState.h
>deleted file mode 100644
>index 5ba8eaa66f10cb6f14553aabf646215e7f9b29c3..0000000000000000000000000000000000000000
>--- a/Source/WebCore/bindings/js/JSMainThreadExecState.h
>+++ /dev/null
>@@ -1,184 +0,0 @@
>-/*
>- * Copyright (C) 2010 Google Inc. All rights reserved.
>- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#pragma once
>-
>-#include "CustomElementReactionQueue.h"
>-#include "JSDOMBinding.h"
>-#include <JavaScriptCore/CatchScope.h>
>-#include <JavaScriptCore/Completion.h>
>-#include <JavaScriptCore/Microtask.h>
>-#include <wtf/MainThread.h>
>-
>-namespace WebCore {
>-
>-class InspectorInstrumentationCookie;
>-class ScriptExecutionContext;
>-
>-class JSMainThreadExecState {
>-    WTF_MAKE_NONCOPYABLE(JSMainThreadExecState);
>-    friend class JSMainThreadNullState;
>-public:
>-    static JSC::ExecState* currentState()
>-    {
>-        ASSERT(isMainThread());
>-        return s_mainThreadState;
>-    };
>-    
>-    static JSC::JSValue call(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException)
>-    {
>-        JSMainThreadExecState currentState(exec);
>-        return JSC::call(exec, functionObject, callType, callData, thisValue, args, returnedException);
>-    };
>-
>-    static JSC::JSValue evaluate(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException)
>-    {
>-        JSMainThreadExecState currentState(exec);
>-        return JSC::evaluate(exec, source, thisValue, returnedException);
>-    };
>-
>-    static JSC::JSValue evaluate(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue = JSC::JSValue())
>-    {
>-        NakedPtr<JSC::Exception> unused;
>-        return evaluate(exec, source, thisValue, unused);
>-    };
>-
>-    static JSC::JSValue profiledCall(JSC::ExecState* exec, JSC::ProfilingReason reason, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException)
>-    {
>-        JSMainThreadExecState currentState(exec);
>-        return JSC::profiledCall(exec, reason, functionObject, callType, callData, thisValue, args, returnedException);
>-    }
>-
>-    static JSC::JSValue profiledEvaluate(JSC::ExecState* exec, JSC::ProfilingReason reason, const JSC::SourceCode& source, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException)
>-    {
>-        JSMainThreadExecState currentState(exec);
>-        return JSC::profiledEvaluate(exec, reason, source, thisValue, returnedException);
>-    }
>-
>-    static JSC::JSValue profiledEvaluate(JSC::ExecState* exec, JSC::ProfilingReason reason, const JSC::SourceCode& source, JSC::JSValue thisValue = JSC::JSValue())
>-    {
>-        NakedPtr<JSC::Exception> unused;
>-        return profiledEvaluate(exec, reason, source, thisValue, unused);
>-    }
>-
>-    static void runTask(JSC::ExecState* exec, JSC::Microtask& task)
>-    {
>-        JSMainThreadExecState currentState(exec);
>-        task.run(exec);
>-    }
>-
>-    static JSC::JSInternalPromise& loadModule(JSC::ExecState& state, const String& moduleName, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
>-    {
>-        JSMainThreadExecState currentState(&state);
>-        return *JSC::loadModule(&state, moduleName, parameters, scriptFetcher);
>-    }
>-
>-    static JSC::JSInternalPromise& loadModule(JSC::ExecState& state, const JSC::SourceCode& sourceCode, JSC::JSValue scriptFetcher)
>-    {
>-        JSMainThreadExecState currentState(&state);
>-        return *JSC::loadModule(&state, sourceCode, scriptFetcher);
>-    }
>-
>-    static JSC::JSValue linkAndEvaluateModule(JSC::ExecState& state, const JSC::Identifier& moduleKey, JSC::JSValue scriptFetcher, NakedPtr<JSC::Exception>& returnedException)
>-    {
>-        JSC::VM& vm = state.vm();
>-        auto scope = DECLARE_CATCH_SCOPE(vm);
>-    
>-        JSMainThreadExecState currentState(&state);
>-        auto returnValue = JSC::linkAndEvaluateModule(&state, moduleKey, scriptFetcher);
>-        if (UNLIKELY(scope.exception())) {
>-            returnedException = scope.exception();
>-            scope.clearException();
>-            return JSC::jsUndefined();
>-        }
>-        return returnValue;
>-    }
>-
>-    static InspectorInstrumentationCookie instrumentFunctionCall(ScriptExecutionContext*, JSC::CallType, const JSC::CallData&);
>-    static InspectorInstrumentationCookie instrumentFunctionConstruct(ScriptExecutionContext*, JSC::ConstructType, const JSC::ConstructData&);
>-
>-private:
>-    explicit JSMainThreadExecState(JSC::ExecState* exec)
>-        : m_previousState(s_mainThreadState)
>-        , m_lock(exec)
>-    {
>-        ASSERT(isMainThread());
>-        s_mainThreadState = exec;
>-    };
>-
>-    ~JSMainThreadExecState()
>-    {
>-        JSC::VM& vm = s_mainThreadState->vm();
>-        auto scope = DECLARE_CATCH_SCOPE(vm);
>-        ASSERT(isMainThread());
>-        scope.assertNoException();
>-
>-        JSC::ExecState* state = s_mainThreadState;
>-        bool didExitJavaScript = s_mainThreadState && !m_previousState;
>-
>-        s_mainThreadState = m_previousState;
>-
>-        if (didExitJavaScript)
>-            didLeaveScriptContext(state);
>-    }
>-
>-    template<typename Type, Type jsType, typename DataType> static InspectorInstrumentationCookie instrumentFunctionInternal(ScriptExecutionContext*, Type, const DataType&);
>-
>-    WEBCORE_EXPORT static JSC::ExecState* s_mainThreadState;
>-    JSC::ExecState* m_previousState;
>-    JSC::JSLockHolder m_lock;
>-
>-    static void didLeaveScriptContext(JSC::ExecState*);
>-};
>-
>-// Null state prevents origin security checks.
>-// Used by non-JavaScript bindings (ObjC, GObject).
>-class JSMainThreadNullState {
>-    WTF_MAKE_NONCOPYABLE(JSMainThreadNullState);
>-public:
>-    explicit JSMainThreadNullState()
>-        : m_previousState(JSMainThreadExecState::s_mainThreadState)
>-        , m_customElementReactionStack(m_previousState)
>-    {
>-        ASSERT(isMainThread());
>-        JSMainThreadExecState::s_mainThreadState = nullptr;
>-    }
>-
>-    ~JSMainThreadNullState()
>-    {
>-        ASSERT(isMainThread());
>-        JSMainThreadExecState::s_mainThreadState = m_previousState;
>-    }
>-
>-private:
>-    JSC::ExecState* m_previousState;
>-    CustomElementReactionStack m_customElementReactionStack;
>-};
>-
>-JSC::JSValue functionCallHandlerFromAnyThread(JSC::ExecState*, JSC::JSValue functionObject, JSC::CallType, const JSC::CallData&, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException);
>-JSC::JSValue evaluateHandlerFromAnyThread(JSC::ExecState*, const JSC::SourceCode&, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException);
>-
>-} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/JSMainThreadExecStateInstrumentation.h b/Source/WebCore/bindings/js/JSMainThreadExecStateInstrumentation.h
>deleted file mode 100644
>index 7e04ed18bab1ae1fea40b442574e353836e1a082..0000000000000000000000000000000000000000
>--- a/Source/WebCore/bindings/js/JSMainThreadExecStateInstrumentation.h
>+++ /dev/null
>@@ -1,60 +0,0 @@
>-/*
>- * Copyright (C) 2010 Google Inc. All rights reserved.
>- * Copyright (C) 2013 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#pragma once
>-
>-#include "InspectorInstrumentation.h"
>-#include "JSMainThreadExecState.h"
>-#include <JavaScriptCore/FunctionExecutable.h>
>-
>-namespace WebCore {
>-
>-template<typename Type, Type jsType, class DataType>
>-inline InspectorInstrumentationCookie JSMainThreadExecState::instrumentFunctionInternal(ScriptExecutionContext* context, Type callType, const DataType& callData)
>-{
>-    if (!InspectorInstrumentation::timelineAgentEnabled(context))
>-        return InspectorInstrumentationCookie();
>-    String resourceName;
>-    int lineNumber = 1;
>-    if (callType == jsType) {
>-        resourceName = callData.js.functionExecutable->sourceURL();
>-        lineNumber = callData.js.functionExecutable->firstLine();
>-    } else
>-        resourceName = "undefined";
>-    return InspectorInstrumentation::willCallFunction(context, resourceName, lineNumber);
>-}
>-
>-inline InspectorInstrumentationCookie JSMainThreadExecState::instrumentFunctionCall(ScriptExecutionContext* context, JSC::CallType type, const JSC::CallData& data)
>-{
>-    return instrumentFunctionInternal<JSC::CallType, JSC::CallType::JS, JSC::CallData>(context, type, data);
>-}
>-
>-inline InspectorInstrumentationCookie JSMainThreadExecState::instrumentFunctionConstruct(ScriptExecutionContext* context, JSC::ConstructType type, const JSC::ConstructData& data)
>-{
>-    return instrumentFunctionInternal<JSC::ConstructType, JSC::ConstructType::JS, JSC::ConstructData>(context, type, data);
>-}
>-
>-} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/JSMicrotaskCallback.h b/Source/WebCore/bindings/js/JSMicrotaskCallback.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..536dcef11690994399910476d5b62f8c6034cea8
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/JSMicrotaskCallback.h
>@@ -0,0 +1,65 @@
>+/*
>+ * Copyright (C) 2018 Yusuke Suzuki <utatane.tea@gmail.com>.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ *
>+ */
>+
>+#pragma once
>+
>+#include "JSExecState.h"
>+
>+namespace WebCore {
>+
>+class JSMicrotaskCallback : public RefCounted<JSMicrotaskCallback> {
>+public:
>+    static Ref<JSMicrotaskCallback> create(JSDOMGlobalObject& globalObject, Ref<JSC::Microtask>&& task)
>+    {
>+        return adoptRef(*new JSMicrotaskCallback(globalObject, WTFMove(task)));
>+    }
>+
>+    void call()
>+    {
>+        Ref<JSMicrotaskCallback> protectedThis(*this);
>+        VM& vm = m_globalObject->vm();
>+        JSLockHolder lock(vm);
>+        auto scope = DECLARE_THROW_SCOPE(vm);
>+
>+        ExecState* exec = m_globalObject->globalExec();
>+
>+        JSExecState::runTask(exec, m_task);
>+
>+        scope.assertNoException();
>+    }
>+
>+private:
>+    JSMicrotaskCallback(JSDOMGlobalObject& globalObject, Ref<JSC::Microtask>&& task)
>+        : m_globalObject { globalObject.vm(), &globalObject }
>+        , m_task { WTFMove(task) }
>+    {
>+    }
>+
>+    Strong<JSDOMGlobalObject> m_globalObject;
>+    Ref<JSC::Microtask> m_task;
>+};
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp
>index fd60df88afd6e09166c41b0279d22318dad888e3..f4c43531858dae4de82b39ac83c0773f190d9fa5 100644
>--- a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp
>+++ b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp
>@@ -28,9 +28,11 @@
> #include "config.h"
> #include "JSWorkerGlobalScopeBase.h"
> 
>+#include "ActiveDOMCallbackMicrotask.h"
> #include "DOMWrapperWorld.h"
> #include "JSDOMGlobalObjectTask.h"
> #include "JSDedicatedWorkerGlobalScope.h"
>+#include "JSMicrotaskCallback.h"
> #include "JSWorkerGlobalScope.h"
> #include "WorkerGlobalScope.h"
> #include "WorkerThread.h"
>@@ -129,7 +131,14 @@ RuntimeFlags JSWorkerGlobalScopeBase::javaScriptRuntimeFlags(const JSGlobalObjec
> void JSWorkerGlobalScopeBase::queueTaskToEventLoop(JSGlobalObject& object, Ref<JSC::Microtask>&& task)
> {
>     JSWorkerGlobalScopeBase& thisObject = static_cast<JSWorkerGlobalScopeBase&>(object);
>-    thisObject.scriptExecutionContext()->postTask(JSGlobalObjectTask(thisObject, WTFMove(task)));
>+
>+    RefPtr<JSMicrotaskCallback> callback = JSMicrotaskCallback::create(thisObject, WTFMove(task));
>+    auto& context = thisObject.wrapped();
>+    auto microtask = std::make_unique<ActiveDOMCallbackMicrotask>(context.microtaskQueue(), context, [callback]() mutable {
>+        callback->call();
>+    });
>+
>+    context.microtaskQueue().append(WTFMove(microtask));
> }
> 
> JSValue toJS(ExecState* exec, JSDOMGlobalObject*, WorkerGlobalScope& workerGlobalScope)
>diff --git a/Source/WebCore/bindings/js/ScheduledAction.cpp b/Source/WebCore/bindings/js/ScheduledAction.cpp
>index 15d126be3532b537b340d49aafa5264c01ff33f5..0343df82eefd447a1830ddb2039a220dc47bc79d 100644
>--- a/Source/WebCore/bindings/js/ScheduledAction.cpp
>+++ b/Source/WebCore/bindings/js/ScheduledAction.cpp
>@@ -32,8 +32,8 @@
> #include "FrameLoader.h"
> #include "JSDOMExceptionHandling.h"
> #include "JSDOMWindow.h"
>-#include "JSMainThreadExecState.h"
>-#include "JSMainThreadExecStateInstrumentation.h"
>+#include "JSExecState.h"
>+#include "JSExecStateInstrumentation.h"
> #include "JSWorkerGlobalScope.h"
> #include "ScriptController.h"
> #include "ScriptExecutionContext.h"
>@@ -112,13 +112,10 @@ void ScheduledAction::executeFunctionInContext(JSGlobalObject* globalObject, JSV
>         return;
>     }
> 
>-    InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(&context, callType, callData);
>+    InspectorInstrumentationCookie cookie = JSExecState::instrumentFunctionCall(&context, callType, callData);
> 
>     NakedPtr<JSC::Exception> exception;
>-    if (is<Document>(context))
>-        JSMainThreadExecState::profiledCall(exec, JSC::ProfilingReason::Other, m_function.get(), callType, callData, thisValue, arguments, exception);
>-    else
>-        JSC::profiledCall(exec, JSC::ProfilingReason::Other, m_function.get(), callType, callData, thisValue, arguments, exception);
>+    JSExecState::profiledCall(exec, JSC::ProfilingReason::Other, m_function.get(), callType, callData, thisValue, arguments, exception);
> 
>     InspectorInstrumentation::didCallFunction(cookie, &context);
> 
>diff --git a/Source/WebCore/bindings/js/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp
>index ce4c4e095f69cdf044112c190bca135d911cceb6..8869db1f9a32ddc3d205c8ff85d2294019d29b31 100644
>--- a/Source/WebCore/bindings/js/ScriptController.cpp
>+++ b/Source/WebCore/bindings/js/ScriptController.cpp
>@@ -36,7 +36,7 @@
> #include "JSDOMExceptionHandling.h"
> #include "JSDOMWindow.h"
> #include "JSDocument.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "LoadableModuleScript.h"
> #include "ModuleFetchFailureKind.h"
> #include "ModuleFetchParameters.h"
>@@ -128,7 +128,7 @@ JSValue ScriptController::evaluateInWorld(const ScriptSourceCode& sourceCode, DO
>     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willEvaluateScript(m_frame, sourceURL, sourceCode.startLine());
> 
>     NakedPtr<JSC::Exception> evaluationException;
>-    JSValue returnValue = JSMainThreadExecState::profiledEvaluate(&exec, JSC::ProfilingReason::Other, jsSourceCode, &proxy, evaluationException);
>+    JSValue returnValue = JSExecState::profiledEvaluate(&exec, JSC::ProfilingReason::Other, jsSourceCode, &proxy, evaluationException);
> 
>     InspectorInstrumentation::didEvaluateScript(cookie, m_frame);
> 
>@@ -154,7 +154,7 @@ void ScriptController::loadModuleScriptInWorld(LoadableModuleScript& moduleScrip
>     auto& proxy = jsWindowProxy(world);
>     auto& state = *proxy.window()->globalExec();
> 
>-    auto& promise = JSMainThreadExecState::loadModule(state, moduleName, JSC::JSScriptFetchParameters::create(state.vm(), WTFMove(topLevelFetchParameters)), JSC::JSScriptFetcher::create(state.vm(), { &moduleScript }));
>+    auto& promise = JSExecState::loadModule(state, moduleName, JSC::JSScriptFetchParameters::create(state.vm(), WTFMove(topLevelFetchParameters)), JSC::JSScriptFetcher::create(state.vm(), { &moduleScript }));
>     setupModuleScriptHandlers(moduleScript, promise, world);
> }
> 
>@@ -170,7 +170,7 @@ void ScriptController::loadModuleScriptInWorld(LoadableModuleScript& moduleScrip
>     auto& proxy = jsWindowProxy(world);
>     auto& state = *proxy.window()->globalExec();
> 
>-    auto& promise = JSMainThreadExecState::loadModule(state, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(state.vm(), { &moduleScript }));
>+    auto& promise = JSExecState::loadModule(state, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(state.vm(), { &moduleScript }));
>     setupModuleScriptHandlers(moduleScript, promise, world);
> }
> 
>@@ -191,7 +191,7 @@ JSC::JSValue ScriptController::linkAndEvaluateModuleScriptInWorld(LoadableModule
>     Ref<Frame> protector(m_frame);
> 
>     NakedPtr<JSC::Exception> evaluationException;
>-    auto returnValue = JSMainThreadExecState::linkAndEvaluateModule(state, Identifier::fromUid(&state.vm(), moduleScript.moduleKey()), jsUndefined(), evaluationException);
>+    auto returnValue = JSExecState::linkAndEvaluateModule(state, Identifier::fromUid(&state.vm(), moduleScript.moduleKey()), jsUndefined(), evaluationException);
>     if (evaluationException) {
>         // FIXME: Give a chance to dump the stack trace if the "crossorigin" attribute allows.
>         // https://bugs.webkit.org/show_bug.cgi?id=164539
>@@ -380,7 +380,7 @@ void ScriptController::disableWebAssembly(const String& errorMessage)
> 
> bool ScriptController::canAccessFromCurrentOrigin(Frame* frame)
> {
>-    auto* state = JSMainThreadExecState::currentState();
>+    auto* state = JSExecState::currentState();
> 
>     // If the current state is null we're in a call path where the DOM security check doesn't apply (eg. parser).
>     if (!state)
>diff --git a/Source/WebCore/bindings/js/WorkerScriptController.cpp b/Source/WebCore/bindings/js/WorkerScriptController.cpp
>index 9bc583aafed9705a511bc18f4b055f520e58addc..a373c39fcdea508e8f041b54eed606f5a3896f44 100644
>--- a/Source/WebCore/bindings/js/WorkerScriptController.cpp
>+++ b/Source/WebCore/bindings/js/WorkerScriptController.cpp
>@@ -30,6 +30,7 @@
> #include "JSDOMBinding.h"
> #include "JSDedicatedWorkerGlobalScope.h"
> #include "JSEventTarget.h"
>+#include "JSExecState.h"
> #include "JSServiceWorkerGlobalScope.h"
> #include "ScriptSourceCode.h"
> #include "WebCoreJSClientData.h"
>@@ -143,7 +144,7 @@ void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, NakedP
>     VM& vm = state.vm();
>     JSLockHolder lock { vm };
> 
>-    JSC::evaluate(&state, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper->globalThis(), returnedException);
>+    JSExecState::profiledEvaluate(&state, JSC::ProfilingReason::Other, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper->globalThis(), returnedException);
> 
>     if ((returnedException && isTerminatedExecutionException(vm, returnedException)) || isTerminatingExecution()) {
>         forbidExecution();
>diff --git a/Source/WebCore/bridge/objc/WebScriptObject.mm b/Source/WebCore/bridge/objc/WebScriptObject.mm
>index 03977940bd0d9b13913e492b84c2d89245f5d9db..97c7d7c206e79fd30e08c49fd02d21460304d8af 100644
>--- a/Source/WebCore/bridge/objc/WebScriptObject.mm
>+++ b/Source/WebCore/bridge/objc/WebScriptObject.mm
>@@ -31,8 +31,8 @@
> #import "JSDOMBindingSecurity.h"
> #import "JSDOMWindow.h"
> #import "JSDOMWindowCustom.h"
>+#import "JSExecState.h"
> #import "JSHTMLElement.h"
>-#import "JSMainThreadExecState.h"
> #import "JSPluginElementFunctions.h"
> #import "ObjCRuntimeObject.h"
> #import "WebCoreObjCExtras.h"
>@@ -360,7 +360,7 @@ - (id)callWebScriptMethod:(NSString *)name withArguments:(NSArray *)args
>         return nil;
> 
>     NakedPtr<JSC::Exception> exception;
>-    JSC::JSValue result = JSMainThreadExecState::profiledCall(exec, JSC::ProfilingReason::Other, function, callType, callData, [self _imp], argList, exception);
>+    JSC::JSValue result = JSExecState::profiledCall(exec, JSC::ProfilingReason::Other, function, callType, callData, [self _imp], argList, exception);
> 
>     if (exception) {
>         addExceptionToConsole(exec, exception);
>@@ -385,7 +385,7 @@ - (id)evaluateWebScript:(NSString *)script
>     ExecState* exec = globalObject->globalExec();
>     UNUSED_PARAM(scope);
>     
>-    JSC::JSValue returnValue = JSMainThreadExecState::profiledEvaluate(exec, JSC::ProfilingReason::Other, makeSource(String(script), { }), JSC::JSValue());
>+    JSC::JSValue returnValue = JSExecState::profiledEvaluate(exec, JSC::ProfilingReason::Other, makeSource(String(script), { }), JSC::JSValue());
> 
>     id resultObj = [WebScriptObject _convertValueToObjcValue:returnValue originRootObject:[self _originRootObject] rootObject:[self _rootObject]];
>     
>diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
>index fe8375b0abb1098ab9fc9c4d9dd089f2c8e78430..592792fda7d607e254196654e62508f176d4ec0f 100644
>--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
>+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
>@@ -53,7 +53,7 @@
> #include "ImageData.h"
> #include "InspectorInstrumentation.h"
> #include "IntSize.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "Logging.h"
> #include "NotImplemented.h"
> #include "OESElementIndexUint.h"
>@@ -1534,7 +1534,7 @@ void WebGLRenderingContextBase::compileShader(WebGLShader* shader)
>     auto* canvas = htmlCanvas();
> 
>     if (canvas && m_synthesizedErrorsToConsole && !value) {
>-        Ref<Inspector::ScriptCallStack> stackTrace = Inspector::createScriptCallStack(JSMainThreadExecState::currentState());
>+        Ref<Inspector::ScriptCallStack> stackTrace = Inspector::createScriptCallStack(JSExecState::currentState());
> 
>         for (auto& error : getShaderInfoLog(shader).split('\n'))
>             canvas->document().addConsoleMessage(std::make_unique<Inspector::ConsoleMessage>(MessageSource::Rendering, MessageType::Log, MessageLevel::Error, "WebGL: " + error, stackTrace.copyRef()));
>@@ -5656,7 +5656,7 @@ void WebGLRenderingContextBase::printToConsole(MessageLevel level, const String&
> 
>     // Error messages can occur during function calls, so show stack traces for them.
>     if (level == MessageLevel::Error) {
>-        Ref<Inspector::ScriptCallStack> stackTrace = Inspector::createScriptCallStack(JSMainThreadExecState::currentState());
>+        Ref<Inspector::ScriptCallStack> stackTrace = Inspector::createScriptCallStack(JSExecState::currentState());
>         consoleMessage = std::make_unique<Inspector::ConsoleMessage>(MessageSource::Rendering, MessageType::Log, level, message, WTFMove(stackTrace));
>     } else
>         consoleMessage = std::make_unique<Inspector::ConsoleMessage>(MessageSource::Rendering, MessageType::Log, level, message);
>diff --git a/Source/WebCore/inspector/InspectorCanvas.cpp b/Source/WebCore/inspector/InspectorCanvas.cpp
>index 3b2284fcddd28d212d19a2dcbe4265af0351448c..0caa76460bea3c36138b969239f0419b2605be51 100644
>--- a/Source/WebCore/inspector/InspectorCanvas.cpp
>+++ b/Source/WebCore/inspector/InspectorCanvas.cpp
>@@ -51,8 +51,8 @@
> #include "JSCanvasLineJoin.h"
> #include "JSCanvasTextAlign.h"
> #include "JSCanvasTextBaseline.h"
>+#include "JSExecState.h"
> #include "JSImageSmoothingQuality.h"
>-#include "JSMainThreadExecState.h"
> #include "Path2D.h"
> #include "Pattern.h"
> #include "RecordingSwizzleTypes.h"
>@@ -289,7 +289,7 @@ Ref<Inspector::Protocol::Canvas::Canvas> InspectorCanvas::buildObjectForCanvas(I
>     }
> 
>     if (captureBacktrace) {
>-        auto stackTrace = Inspector::createScriptCallStack(JSMainThreadExecState::currentState(), Inspector::ScriptCallStack::maxCallStackSizeToCapture);
>+        auto stackTrace = Inspector::createScriptCallStack(JSExecState::currentState(), Inspector::ScriptCallStack::maxCallStackSizeToCapture);
>         canvas->setBacktrace(stackTrace->buildInspectorArray());
>     }
> 
>@@ -602,7 +602,7 @@ Ref<JSON::ArrayOf<JSON::Value>> InspectorCanvas::buildAction(const String& name,
>     action->addItem(WTFMove(swizzleTypes));
> 
>     auto trace = JSON::ArrayOf<double>::create();
>-    auto stackTrace = Inspector::createScriptCallStack(JSMainThreadExecState::currentState(), Inspector::ScriptCallStack::maxCallStackSizeToCapture);
>+    auto stackTrace = Inspector::createScriptCallStack(JSExecState::currentState(), Inspector::ScriptCallStack::maxCallStackSizeToCapture);
>     for (size_t i = 0; i < stackTrace->size(); ++i)
>         trace->addItem(indexForData(stackTrace->at(i)));
>     action->addItem(WTFMove(trace));
>diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
>index 20eb10fa5db8b37ae70687f1aa86572352c8d471..c514967aacc1f434e437cb0212aa2063d03f78a7 100644
>--- a/Source/WebCore/inspector/InspectorController.cpp
>+++ b/Source/WebCore/inspector/InspectorController.cpp
>@@ -58,7 +58,7 @@
> #include "JSDOMBindingSecurity.h"
> #include "JSDOMWindow.h"
> #include "JSDOMWindowCustom.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "Page.h"
> #include "PageConsoleAgent.h"
> #include "PageDebuggerAgent.h"
>diff --git a/Source/WebCore/inspector/InspectorFrontendHost.cpp b/Source/WebCore/inspector/InspectorFrontendHost.cpp
>index 55f3d4879183ffabb0fc862be756200ba584e882..c734da2beae1384527d772ae9be18b37f5445c8b 100644
>--- a/Source/WebCore/inspector/InspectorFrontendHost.cpp
>+++ b/Source/WebCore/inspector/InspectorFrontendHost.cpp
>@@ -45,8 +45,8 @@
> #include "InspectorFrontendClient.h"
> #include "JSDOMConvertInterface.h"
> #include "JSDOMExceptionHandling.h"
>+#include "JSExecState.h"
> #include "JSInspectorFrontendHost.h"
>-#include "JSMainThreadExecState.h"
> #include "MouseEvent.h"
> #include "Node.h"
> #include "Page.h"
>diff --git a/Source/WebCore/inspector/TimelineRecordFactory.cpp b/Source/WebCore/inspector/TimelineRecordFactory.cpp
>index cc6c1b35adccb3eb5593f0f006cf4fbf50f1ea7f..f2b7be1317d7e2a5f03bfc9229e8829adec52be7 100644
>--- a/Source/WebCore/inspector/TimelineRecordFactory.cpp
>+++ b/Source/WebCore/inspector/TimelineRecordFactory.cpp
>@@ -34,7 +34,7 @@
> 
> #include "Event.h"
> #include "FloatQuad.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include <JavaScriptCore/InspectorProtocolObjects.h>
> #include <JavaScriptCore/ScriptBreakpoint.h>
> #include <JavaScriptCore/ScriptCallStack.h>
>@@ -50,7 +50,7 @@ Ref<JSON::Object> TimelineRecordFactory::createGenericRecord(double startTime, i
>     record->setDouble("startTime"_s, startTime);
> 
>     if (maxCallStackDepth) {
>-        Ref<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), maxCallStackDepth);
>+        Ref<ScriptCallStack> stackTrace = createScriptCallStack(JSExecState::currentState(), maxCallStackDepth);
>         if (stackTrace->size())
>             record->setValue("stackTrace"_s, stackTrace->buildInspectorArray());
>     }
>diff --git a/Source/WebCore/inspector/WorkerInspectorController.cpp b/Source/WebCore/inspector/WorkerInspectorController.cpp
>index aa81e0100fefea7b8bbc08151ce8dc6eb35367cd..77d0531ef914d1a357afadc756c6975cb39cbfec 100644
>--- a/Source/WebCore/inspector/WorkerInspectorController.cpp
>+++ b/Source/WebCore/inspector/WorkerInspectorController.cpp
>@@ -28,7 +28,7 @@
> 
> #include "CommandLineAPIHost.h"
> #include "InstrumentingAgents.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "WebHeapAgent.h"
> #include "WebInjectedScriptHost.h"
> #include "WebInjectedScriptManager.h"
>diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp b/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp
>index 812184115a03c4371e97764490fd046fc5f3c41d..543937eb616100d75191d5debe02f65be5f7a29d 100644
>--- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp
>+++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp
>@@ -35,8 +35,8 @@
> #include "InspectorDOMAgent.h"
> #include "InstrumentingAgents.h"
> #include "JSCanvasRenderingContext2D.h"
>+#include "JSExecState.h"
> #include "JSImageBitmapRenderingContext.h"
>-#include "JSMainThreadExecState.h"
> #include "OffscreenCanvas.h"
> #include "ScriptState.h"
> #include "StringAdaptors.h"
>diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
>index 86ef81f24c428b21406534c66aa1fbb3dda28d74..b2889a36b5f21ef8a13754cffe87f53ff4be3877 100644
>--- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
>+++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
>@@ -47,7 +47,7 @@
> #include "HTTPHeaderNames.h"
> #include "InspectorTimelineAgent.h"
> #include "InstrumentingAgents.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "JSWebSocket.h"
> #include "LoaderStrategy.h"
> #include "MIMETypeRegistry.h"
>@@ -641,7 +641,7 @@ RefPtr<Inspector::Protocol::Network::Initiator> InspectorNetworkAgent::buildInit
>             .release();
>     }
> 
>-    Ref<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState());
>+    Ref<ScriptCallStack> stackTrace = createScriptCallStack(JSExecState::currentState());
>     if (stackTrace->size() > 0) {
>         auto initiatorObject = Inspector::Protocol::Network::Initiator::create()
>             .setType(Inspector::Protocol::Network::Initiator::Type::Script)
>diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
>index 813fcaf55253075f19b8122cf01c6a9434833fb1..b2618b924fa529343b7a0fc4ebd48d32d6b84736 100644
>--- a/Source/WebCore/page/DOMWindow.cpp
>+++ b/Source/WebCore/page/DOMWindow.cpp
>@@ -67,7 +67,7 @@
> #include "History.h"
> #include "InspectorInstrumentation.h"
> #include "JSDOMWindowBase.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "Location.h"
> #include "MediaQueryList.h"
> #include "MediaQueryMatcher.h"
>@@ -956,7 +956,7 @@ ExceptionOr<void> DOMWindow::postMessage(JSC::ExecState& state, DOMWindow& incum
>     // Capture stack trace only when inspector front-end is loaded as it may be time consuming.
>     RefPtr<ScriptCallStack> stackTrace;
>     if (InspectorInstrumentation::consoleAgentEnabled(sourceDocument))
>-        stackTrace = createScriptCallStack(JSMainThreadExecState::currentState());
>+        stackTrace = createScriptCallStack(JSExecState::currentState());
> 
>     MessageWithMessagePorts message { messageData.releaseReturnValue(), disentangledPorts.releaseReturnValue() };
> 
>diff --git a/Source/WebCore/page/PageConsoleClient.cpp b/Source/WebCore/page/PageConsoleClient.cpp
>index 1c350cdeca6ec5bb1129e9c49cd84d8ac8ad4b45..d8f3039199ba0c3eab9fef464b45093042324fa6 100644
>--- a/Source/WebCore/page/PageConsoleClient.cpp
>+++ b/Source/WebCore/page/PageConsoleClient.cpp
>@@ -38,8 +38,8 @@
> #include "InspectorController.h"
> #include "InspectorInstrumentation.h"
> #include "JSCanvasRenderingContext2D.h"
>+#include "JSExecState.h"
> #include "JSHTMLCanvasElement.h"
>-#include "JSMainThreadExecState.h"
> #include "JSOffscreenCanvas.h"
> #include "OffscreenCanvas.h"
> #include "Page.h"
>@@ -134,7 +134,7 @@ void PageConsoleClient::addMessage(MessageSource source, MessageLevel level, con
>     unsigned column = 0;
>     getParserLocationForConsoleMessage(document, url, line, column);
> 
>-    addMessage(source, level, message, url, line, column, 0, JSMainThreadExecState::currentState(), requestIdentifier);
>+    addMessage(source, level, message, url, line, column, 0, JSExecState::currentState(), requestIdentifier);
> }
> 
> void PageConsoleClient::addMessage(MessageSource source, MessageLevel level, const String& message, Ref<ScriptCallStack>&& callStack)
>diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
>index 04e4f97b8784770449b35414b54b5ec0506431ad..9b966fa02b8b57f12b082e3db964d3e45504c637 100644
>--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
>+++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
>@@ -42,7 +42,7 @@
> #include "Frame.h"
> #include "HTMLParserIdioms.h"
> #include "InspectorInstrumentation.h"
>-#include "JSMainThreadExecState.h"
>+#include "JSExecState.h"
> #include "JSWindowProxy.h"
> #include "ParsingUtilities.h"
> #include "PingLoader.h"
>@@ -691,7 +691,7 @@ void ContentSecurityPolicy::reportViolation(const String& effectiveViolatedDirec
> 
>         info.documentURI = document.url().strippedForUseAsReferrer();
> 
>-        auto stack = createScriptCallStack(JSMainThreadExecState::currentState(), 2);
>+        auto stack = createScriptCallStack(JSExecState::currentState(), 2);
>         auto* callFrame = stack->firstNonNativeCallFrame();
>         if (callFrame && callFrame->lineNumber()) {
>             info.sourceFile = deprecatedURLForReporting(URL { URL { }, callFrame->sourceURL() });
>diff --git a/Source/WebCore/platform/ThreadGlobalData.h b/Source/WebCore/platform/ThreadGlobalData.h
>index d28f73985a9dce74b57efb0f8939d946c864d1a8..17970af31ebdab46b32cde82f5b7bc3704cf227a 100644
>--- a/Source/WebCore/platform/ThreadGlobalData.h
>+++ b/Source/WebCore/platform/ThreadGlobalData.h
>@@ -30,6 +30,9 @@
> #include <wtf/ThreadSafeRefCounted.h>
> #include <wtf/text/StringHash.h>
> 
>+namespace JSC {
>+class ExecState;
>+} // namespace JSC
> namespace WebCore {
> 
>     class QualifiedNameCache;
>@@ -58,6 +61,9 @@ namespace WebCore {
> 
>         ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
> 
>+        JSC::ExecState* currentState() const { return m_currentState; }
>+        void setCurrentState(JSC::ExecState* state) { m_currentState = state; }
>+
> #if USE(WEB_THREAD)
>         void setWebCoreThreadData();
> #endif
>@@ -70,6 +76,7 @@ namespace WebCore {
>         std::unique_ptr<EventNames> m_eventNames;
>         std::unique_ptr<ThreadTimers> m_threadTimers;
>         std::unique_ptr<QualifiedNameCache> m_qualifiedNameCache;
>+        JSC::ExecState* m_currentState { nullptr };
> 
> #ifndef NDEBUG
>         bool m_isMainThread;
>diff --git a/Source/WebCore/workers/WorkerGlobalScope.cpp b/Source/WebCore/workers/WorkerGlobalScope.cpp
>index a5b1b36eda2d68114806aaaed45c5b89796fa1fb..4f8e66de04be1860ac4ca90dcfa792b64dc3af70 100644
>--- a/Source/WebCore/workers/WorkerGlobalScope.cpp
>+++ b/Source/WebCore/workers/WorkerGlobalScope.cpp
>@@ -33,6 +33,7 @@
> #include "IDBConnectionProxy.h"
> #include "ImageBitmapOptions.h"
> #include "InspectorInstrumentation.h"
>+#include "Microtasks.h"
> #include "Performance.h"
> #include "ScheduledAction.h"
> #include "ScriptSourceCode.h"
>@@ -60,6 +61,7 @@ WorkerGlobalScope::WorkerGlobalScope(const URL& url, Ref<SecurityOrigin>&& origi
>     , m_thread(thread)
>     , m_script(std::make_unique<WorkerScriptController>(this))
>     , m_inspectorController(std::make_unique<WorkerInspectorController>(*this))
>+    , m_microtaskQueue(std::make_unique<MicrotaskQueue>())
>     , m_isOnline(isOnline)
>     , m_shouldBypassMainWorldContentSecurityPolicy(shouldBypassMainWorldContentSecurityPolicy)
>     , m_eventQueue(*this)
>@@ -110,6 +112,11 @@ void WorkerGlobalScope::removeAllEventListeners()
>     m_performance->removeAllObservers();
> }
> 
>+void WorkerGlobalScope::removeMicrotaskQueue()
>+{
>+    m_microtaskQueue = nullptr;
>+}
>+
> bool WorkerGlobalScope::isSecureContext() const
> {
>     return securityOrigin() && securityOrigin()->isPotentiallyTrustworthy();
>diff --git a/Source/WebCore/workers/WorkerGlobalScope.h b/Source/WebCore/workers/WorkerGlobalScope.h
>index bac0db88dad55278a423d9896d7806156c4df8ed..68c34447702b1c32b64aaf218a2017a7c32a9114 100644
>--- a/Source/WebCore/workers/WorkerGlobalScope.h
>+++ b/Source/WebCore/workers/WorkerGlobalScope.h
>@@ -44,6 +44,7 @@ namespace WebCore {
> 
> class ContentSecurityPolicyResponseHeaders;
> class Crypto;
>+class MicrotaskQueue;
> class Performance;
> class ScheduledAction;
> class WorkerInspectorController;
>@@ -78,6 +79,8 @@ class WorkerGlobalScope : public RefCounted<WorkerGlobalScope>, public Supplemen
> 
>     WorkerInspectorController& inspectorController() const { return *m_inspectorController; }
> 
>+    MicrotaskQueue& microtaskQueue() const { return *m_microtaskQueue; }
>+
>     WorkerThread& thread() const { return m_thread; }
> 
>     using ScriptExecutionContext::hasPendingActivity;
>@@ -116,6 +119,8 @@ class WorkerGlobalScope : public RefCounted<WorkerGlobalScope>, public Supplemen
> 
>     void removeAllEventListeners() final;
> 
>+    void removeMicrotaskQueue();
>+
>     void createImageBitmap(ImageBitmap::Source&&, ImageBitmapOptions&&, ImageBitmap::Promise&&);
>     void createImageBitmap(ImageBitmap::Source&&, int sx, int sy, int sw, int sh, ImageBitmapOptions&&, ImageBitmap::Promise&&);
> 
>@@ -179,6 +184,7 @@ class WorkerGlobalScope : public RefCounted<WorkerGlobalScope>, public Supplemen
>     WorkerThread& m_thread;
>     std::unique_ptr<WorkerScriptController> m_script;
>     std::unique_ptr<WorkerInspectorController> m_inspectorController;
>+    std::unique_ptr<MicrotaskQueue> m_microtaskQueue;
> 
>     bool m_closing { false };
>     bool m_isOnline;
>diff --git a/Source/WebCore/workers/WorkerThread.cpp b/Source/WebCore/workers/WorkerThread.cpp
>index f9a790343913cd09eea833965ee2d0e1dee3db53..533d11af64aa977103dc95e8aab0f27c4129f1dd 100644
>--- a/Source/WebCore/workers/WorkerThread.cpp
>+++ b/Source/WebCore/workers/WorkerThread.cpp
>@@ -299,6 +299,9 @@ void WorkerThread::stop(WTF::Function<void()>&& stoppedCallback)
>             // which become dangling once Heap is destroyed.
>             workerGlobalScope.removeAllEventListeners();
> 
>+            // MicrotaskQueue references Heap.
>+            workerGlobalScope.removeMicrotaskQueue();
>+
>             // Stick a shutdown command at the end of the queue, so that we deal
>             // with all the cleanup tasks the databases post first.
>             workerGlobalScope.postTask({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext& context) {
>diff --git a/Source/WebCore/workers/service/ExtendableEvent.cpp b/Source/WebCore/workers/service/ExtendableEvent.cpp
>index 5cc6cef521f89b3c5e70286b90dff91a3032d5c5..e2195619b067d104a0f27cad6baa93599dab4113 100644
>--- a/Source/WebCore/workers/service/ExtendableEvent.cpp
>+++ b/Source/WebCore/workers/service/ExtendableEvent.cpp
>@@ -29,6 +29,7 @@
> #if ENABLE(SERVICE_WORKER)
> 
> #include "JSDOMPromise.h"
>+#include "ScriptExecutionContext.h"
> #include <JavaScriptCore/Microtask.h>
> 
> namespace WebCore {
>@@ -85,19 +86,25 @@ class FunctionMicrotask final : public JSC::Microtask {
> void ExtendableEvent::addExtendLifetimePromise(Ref<DOMPromise>&& promise)
> {
>     promise->whenSettled([this, protectedThis = makeRefPtr(this), settledPromise = promise.ptr()] () mutable {
>-        settledPromise->globalObject()->queueMicrotask(FunctionMicrotask::create([this, protectedThis = WTFMove(protectedThis)] {
>+        auto& globalObject = *settledPromise->globalObject();
>+        globalObject.queueMicrotask(FunctionMicrotask::create([this, protectedThis = WTFMove(protectedThis), settledPromise = WTFMove(settledPromise)] () mutable {
>             --m_pendingPromiseCount;
> 
>             // FIXME: Let registration be the context object's relevant global object's associated service worker's containing service worker registration.
>             // FIXME: If registration's uninstalling flag is set, invoke Try Clear Registration with registration.
>             // FIXME: If registration is not null, invoke Try Activate with registration.
> 
>-            if (m_pendingPromiseCount)
>+            auto* context = settledPromise->globalObject()->scriptExecutionContext();
>+            if (!context)
>                 return;
>-
>-            auto settledPromises = WTFMove(m_extendLifetimePromises);
>-            if (auto handler = WTFMove(m_whenAllExtendLifetimePromisesAreSettledHandler))
>-                handler(WTFMove(settledPromises));
>+            context->postTask([this, protectedThis = WTFMove(protectedThis)] (ScriptExecutionContext&) mutable {
>+                if (m_pendingPromiseCount)
>+                    return;
>+
>+                auto settledPromises = WTFMove(m_extendLifetimePromises);
>+                if (auto handler = WTFMove(m_whenAllExtendLifetimePromisesAreSettledHandler))
>+                    handler(WTFMove(settledPromises));
>+            });
>         }));
>     });
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.cpp
>index 6bd9aeed8bc3aca7330679ab5d66337d05caa1cc..9c98da924eed775ca91544475647616d97ddcfbe 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMAttr.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMAttrPrivate.h"
> #include "WebKitDOMElementPrivate.h"
> #include "WebKitDOMEventPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.cpp
>index 6d84c238d3e15c2aca05c612b58a2c48937b6962..bf21058dcde0ed8081f7c66692ed8657c5d131cc 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMBlob.cpp
>@@ -23,7 +23,7 @@
> #include <WebCore/CSSImportRule.h>
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMBlobPrivate.h"
> #include "WebKitDOMPrivate.h"
> #include "ConvertToUTF8String.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.cpp
>index 072c4d0d40f332bfdcbd407cf88d0f0929e49f62..ad8cd68330453f7744b959e2b9ae460a56975795 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCDATASection.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMCDATASectionPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.cpp
>index 3f8bfe66b92b2ccbb590e1e4039b95ed387024b7..1629f321ef1b6aecf1c3e24e23607a9002807f0a 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRule.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMCSSRulePrivate.h"
> #include "WebKitDOMCSSStyleSheetPrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.cpp
>index 82d9212332a17d0a3366974672f442303a6160f5..a3c730141ac1b794977c658298698282664bbfae 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSRuleList.cpp
>@@ -23,7 +23,7 @@
> #include <WebCore/CSSImportRule.h>
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMCSSRuleListPrivate.h"
> #include "WebKitDOMCSSRulePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.cpp
>index f4741c9ff5683c16e86daa0616b714d69b6f8046..d4b4d5d9c32a9d4f7685eaa91f5f9e7d04b1dd14 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleDeclaration.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMCSSRulePrivate.h"
> #include "WebKitDOMCSSStyleDeclarationPrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp
>index 2a112ae2ea8e5af22d7186d680f1b5a5ac1d250b..857b8f4dfba1976b4c84d116f5e02a6060137121 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMCSSRuleListPrivate.h"
> #include "WebKitDOMCSSRulePrivate.h"
> #include "WebKitDOMCSSStyleSheetPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp
>index 6a9eb5928972aaad16b7bffd7a2bfedfd63676c8..e85e5639518245c7dd87992f3a88c54b7989489e 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMCSSValuePrivate.h"
> #include "WebKitDOMPrivate.h"
> #include "ConvertToUTF8String.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp
>index ce90977294826f2976e38c251a7c959d0a1a8c21..200689e76721f656112a2ec5bc551ce67bbf0065 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCharacterData.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMCharacterDataPrivate.h"
> #include "WebKitDOMElementPrivate.h"
> #include "WebKitDOMEventPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.cpp
>index e50fa59adcc9ec769308451df54e35bfe54f9452..e4f5912e77d2953d5e8e4502827a68b54cca9841 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.cpp
>@@ -27,7 +27,7 @@
> #include <WebCore/CSSImportRule.h>
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <wtf/GetPtr.h>
> #include <wtf/RefPtr.h>
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.cpp
>index 95036ad84b6b1a3f110d06fa61acb32123612c3a..374d48d5909df549404ef7e3fb9e8006483bf58a 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.cpp
>@@ -28,7 +28,7 @@
> #include <WebCore/CSSImportRule.h>
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <wtf/GetPtr.h>
> #include <wtf/RefPtr.h>
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.cpp
>index eab34fa221077211411ebae77d65ea20e09b9052..09a882b2cc9ef8790363ea7ee7d901d75b9cc7c6 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMComment.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMCommentPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp
>index f91cf50a06f83f46bc4109134b9bbbf8a266a2e9..bf8c442e3f191d2fcd3b7ee5b72f97eaf80d56ec 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp
>@@ -31,7 +31,7 @@
> #include <WebCore/CSSImportRule.h>
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <WebCore/SVGTests.h>
> #include <wtf/GetPtr.h>
> #include <wtf/RefPtr.h>
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.cpp
>index d0947e46b3977ecffe9c7049bcd163a9282bd1be..c5e283b08eab49085ad945e5baae839294d4ae52 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMSelection.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMSelectionPrivate.h"
> #include "WebKitDOMNodePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp
>index 65c7fbe278cfc123979aedd868d706ef24e2868a..b606e294e5b106d331868cd8205e36ad0bd7522a 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMTokenList.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMTokenListPrivate.h"
> #include "WebKitDOMPrivate.h"
> #include "ConvertToUTF8String.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp
>index 677d66c12544831417d4d814447f405b1b5303d6..09e0c6de8f8496f972b1b1f68a807a3136ae4b21 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <WebCore/SerializedScriptValue.h>
> #include <WebCore/UserMessageHandlersNamespace.h>
> #include <WebCore/WebKitNamespace.h>
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp
>index 0d89352db214740310c4f5cb23dd751fae57ccb5..aa3b5977ff98945c9203de754273a536c3cca7ff 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDeprecated.cpp
>@@ -23,7 +23,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include <WebCore/Element.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <WebCore/HTMLCollection.h>
> #include "WebKitDOMDocumentPrivate.h"
> #include "WebKitDOMElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.cpp
>index e8fec69a08f03d8bfaa78c0d9bc0ecc1f0685b08..5d46bc423109bac5798d6045aa7dcf0271c0722f 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentFragment.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDocumentFragmentPrivate.h"
> #include "WebKitDOMElementPrivate.h"
> #include "WebKitDOMEventPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentGtk.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentGtk.cpp
>index b68bc409f4bae998a6baa49a7ef478178d78ff69..f6997ef01a3f267c49ddd4ee9973c6a7b4156942 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentGtk.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentGtk.cpp
>@@ -55,7 +55,7 @@
> #include <WebCore/CSSImportRule.h>
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <wtf/GetPtr.h>
> #include <wtf/RefPtr.h>
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.cpp
>index 88873b282f338466179627443444f75186a24afa..529a3f16feb6a0f5f370f7cfc87520448e01b749 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocumentType.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDocumentTypePrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementGtk.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementGtk.cpp
>index 31a158edefee73b1ae6db6991096bccf41a3e6ee..bbce97f6500a7c10dacd2936cdc39c1aee9c1582 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementGtk.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElementGtk.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <WebCore/StyledElement.h>
> #include "WebKitDOMAttrPrivate.h"
> #include "WebKitDOMCSSStyleDeclarationPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.cpp
>index 482d5b9243bed11bd6ceaf918d566693bf121ece..ace31c808c11d623e92acc5761ce3d7b972ab4c1 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEvent.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTargetPrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.cpp
>index d639f95e5bb271784bae86a026998260aadd8a70..ce7e21bb3060aaa2f95e0e58b0ebc020a895b0f2 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFile.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMBlobPrivate.h"
> #include "WebKitDOMFilePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.cpp
>index da5416c6390fe19a679ec7242b213babfac7a190..52dfbe5a61ee5cb017789364865215664c40acc0 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMFileList.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMFileListPrivate.h"
> #include "WebKitDOMFilePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.cpp
>index 8e5eddc08e5f8688193a91b0ae14ff9bcff71a7e..cacd050f6727215043f37c0b37dd2770abb02986 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAnchorElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMTokenListPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.cpp
>index 5c17e8cba5a9b2173bf6940c986e9a5d8172a26f..657b2f640b7acd23f4c3f7498ba5ccb656fa9cc4 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAppletElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLAppletElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.cpp
>index 8e09e709f9c25e38ec038e26b64815771534d435..75d9fe44fd91f13ba00b8335307efbbe82cb789d 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLAreaElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMTokenListPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.cpp
>index 6e327afe80b0449864b4c8c1875f1bf840d6bf64..0b4de01034536a8b17d496dac83a46cdc0d44efc 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBRElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLBRElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.cpp
>index 9d10e2cc2acb5fb9633ee1a80b1f0e25f2c08266..001a57852d01cf4cbe9b43f89d62af3645b886bc 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBaseElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLBaseElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.cpp
>index 1b270d586d95b065bb387cea2d5d38b61f7c0946..211fa65a82d65c150e6290918878a328e452296a 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLBodyElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLBodyElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.cpp
>index 616831b1d232acf7bc2670099bc9ab211144c1c3..b033faa1039e21a1ec9b5bf3ea13b128075dd191 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLButtonElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLButtonElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.cpp
>index f33babe783e3ae59f0ff282253071c0aba11e406..0ca47d0ef1ee7e3bc9b05ae04734b9dce9ec63b0 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCanvasElement.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLCanvasElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.cpp
>index 25585ab768c5166032eb38c723e0d67047865688..0175c758c4e41232cb01e82cc37ffec38abd913b 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLCollection.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMHTMLCollectionPrivate.h"
> #include "WebKitDOMNodePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.cpp
>index 64bbe92b18317f4911278364b758f1929dbc567f..3b2c3dd0fd6c35d7cd1d72a3f113b519e91775cc 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDListElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLDListElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.cpp
>index 311f1f06f115303874d60538e206bb91fa0240b9..7e5409058269c731f69cb02b5405c1658f0795a1 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDirectoryElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLDirectoryElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.cpp
>index 5f06416dcf791897bca5ba1ccc30e65524956dee..d44594c90c2165feaf1ff93e2359b16759268624 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDivElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLDivElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.cpp
>index f712e8d9f28981808f4b2da34785e762f278754f..0db65678914741dfe6b31b806343db453ce32df3 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLDocument.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLDocumentPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp
>index 7e17154030dcf0823c9ab3076712c242556f4ba6..e3164360faa43edecc52a02a52d451199b3e9a65 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.cpp
>index 9131246938c7792fe15ec304f76feef3d9c7b9ef..4fa89f90b0dfb6b9072b7c9d63375df23951a7e2 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLEmbedElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLEmbedElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.cpp
>index 6f104b4eaa6404c13f187d8f008cd68c4ad855ec..40861477140b671edb913219b24f8c496d73da8e 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFieldSetElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLCollectionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.cpp
>index ef948d95563f87e5d2552fe8778aeec215687bc9..25d240891d0c3aedfd90d7697120b5f05b170eee 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFontElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLFontElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.cpp
>index ed96f1b53d4f1bd5aaea13c98ce1f441f562189f..df20e4dd5fa606fea4984507bf43665519f05f25 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFormElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLCollectionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.cpp
>index 5b6715238c6939aa7cd9076c25b99251c6d15548..f3447f08b96557e223c4b9fbd8a2601073a988e5 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMWindowPrivate.h"
> #include "WebKitDOMDocumentPrivate.h"
> #include "WebKitDOMEventPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.cpp
>index b1ede5b43f1a220ff375d5ddb3395eea8bf8b554..954ba41f882b3d0f9730a252c20a7bebb1ed4f03 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLFrameSetElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLFrameSetElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.cpp
>index 2f6e240b122d09b7671f38f82cd155f17588e275..29595c8edb62d3fad883817efce93fd7758410af 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHRElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLHRElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.cpp
>index ed469ec9d86000000772d08ff1dfd43dbb961605..5357fc5e248b2e1ee86f63a296db2442b1d4fb6c 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLHeadElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.cpp
>index 17fe1bc2f0680ebd491078e31d0ad46e7ac21554..9bbe17e951c4652d573b499c419f516d874a0b5a 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHeadingElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLHeadingElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.cpp
>index 917b068982ae5f3ba47049543ea95171f23c26b5..29a520b1d28c576b3455afb5cf987ac7931ee2dc 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLHtmlElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLHtmlElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.cpp
>index 3e674af2f1520722068238795b85d547f22516c5..4fe46056c8946da73c18760e4a5c1784d9c22e06 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLIFrameElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMWindowPrivate.h"
> #include "WebKitDOMDocumentPrivate.h"
> #include "WebKitDOMEventPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.cpp
>index 75bc96253cf471150d04451f97b464167c14d9a5..bbd571bb06539cf878359b65879db55fccba0cd8 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLImageElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLImageElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp
>index a1a20f5b046f850b71586d747352453089e1f19e..3ded5e29d5c5e805fe0bd84a70d16d1e88d4f083 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLInputElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMFileListPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.cpp
>index c60ad7ffb61d626a0be4e4f59e024c307576197d..49ea439f2bd7a7e78f4769ff614bed8d391c75b8 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLIElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLLIElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.cpp
>index 3763c573d0c5ae2463b5a51d1446457ed216db67..2dc6c21d45615d731bbcea6a04b14c710629efa5 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLabelElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.cpp
>index a9c62be7b9816b8e94fd5608372e8c1356325c7b..5243a0f59395ee7279aed3fdcf26895a455ba0ae 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLegendElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLFormElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.cpp
>index 77d04026ac5d30bceb4744343d62c46ee84f66a9..3b754b61f69e2a8aac187568e703136ea440c72e 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLLinkElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMTokenListPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.cpp
>index b13bdcd3f624dc443d55e3892fbdedff7e22eb5a..be3dd5a58ab03059da8f949517179a81e7a7684f 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMapElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLCollectionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.cpp
>index 0285c8477d0368084d3f709ef0e498e10284ecbe..9dbccdd6a907c3f45a326658f23355898f77034f 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMarqueeElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLMarqueeElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.cpp
>index 0325cb81babcc514ccb1b7346f4824b04bff715d..ff995fb995b5ec0a044c0d4e15fb69866ac4a8b9 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMenuElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLMenuElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.cpp
>index 5529bd5355c7c8a344c5ed0bd6cfced5385ce563..97fe1bcd2ea1b9b6f952b6fe2d996df4d611e679 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLMetaElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLMetaElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.cpp
>index 5dde14ca614fa84aa9cc061af21d366af4ed2792..dacd9897d73ea81aa04a7c9ac34829862911bf8a 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLModElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLModElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.cpp
>index a30c6d62cdd397abe812986eed22213b75c99a1c..21d23cb09c45929a242faaf4c9efc7b8aa5a1d1b 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOListElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLOListElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.cpp
>index 9068e31015f80482983220ca4ab82d2f5b62d790..004bdae9b5421f3fcad770022be90306045fecd6 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLObjectElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDocumentPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.cpp
>index 9a0189e89a52864fa8da1a399fd8f7fbe708197c..6f7db896b7be7d5ab5d022d96972d33aa75dfe1d 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptGroupElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLOptGroupElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.cpp
>index 895a71273097957096241f25d513b9712e19ce1e..15c745d34f412e8b08e908ff1b18a4f0017d0ebb 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLFormElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.cpp
>index c9f54cc35fb9ad5e717bf6ac30611afa23965eb5..85f6dfee99f5a367290fe2f2f9109c8fb4a3a616 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLOptionsCollection.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMHTMLCollectionPrivate.h"
> #include "WebKitDOMHTMLOptionElementPrivate.h"
> #include "WebKitDOMHTMLOptionsCollectionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.cpp
>index 01b285720a2e9620cb39583bdaa734b834818e10..fc8e72b57ebdfbeac099e2060293e9a1710be5cc 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParagraphElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLParagraphElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.cpp
>index 29ba0f115f6e5d219410f7cb27a645086d01906d..cb8d62c6201b19e2e5f67951d8088f12d2bec572 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLParamElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLParamElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.cpp
>index 4ae2113a9625b810e9a9b15461c55a15472e3173..b7b9c81f513c7d8cd744332a1dcdef51ab60563a 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLPreElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLPreElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.cpp
>index cfb4b39766b581ac3ad95fbe0e6c405f4c217771..9011473a3dcde11d4298bbb63b31439298ac22ee 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLQuoteElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLQuoteElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.cpp
>index 8b141fe3b2400a29fff3b4308193d7739ea08757..f1550bf428811b73a4e60e5c836d0c44c8f3fe76 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLScriptElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLScriptElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp
>index 190acbee746ff5d044ef7bd1205be95f7dca480e..91a810d0020a05908b48bb2c19526f113b0fff3f 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLSelectElement.cpp
>@@ -27,7 +27,7 @@
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
> #include <WebCore/HTMLOptGroupElement.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLCollectionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.cpp
>index e74788b11e6292b58f288320136560a74639d99e..3d0ec8f7a0c896bc92dcfa5bd4ecdebf2ce6ef9d 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLStyleElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLStyleElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.cpp
>index 8ab958bf6f03f10259d4f4753945132a3b4ecc0d..c163ac65f9aca7073be90080b74f495152f8ab85 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCaptionElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLTableCaptionElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.cpp
>index 6b79fc7f8af09389103efba9613eadb0e874c89d..0a36b1633eaa1168befb8b42a90c2051103ed345 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableCellElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLTableCellElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.cpp
>index 090f2092d3857dfab73fe612e2d9ff74f3cbd702..8f4cbabb73fc6acc6e2f7a3cef089b01a37834f5 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableColElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLTableColElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp
>index bbb55474401e7e70a4c82c42a0077411bf0d8f99..6b527f03393f16322c77f00e77ab483c0da54711 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLCollectionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp
>index c874f583d189a65469ae88100345d9e1f72a6b61..afad6700e476458f1a1c9be84b53c9a0b5f13075 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableRowElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLCollectionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp
>index f9438149043b36ac3f1c2e64c4bab4b22907ec3b..301b260ba02f77d4628b6d496d15bb0fef65c6ea 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTableSectionElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLCollectionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.cpp
>index 800d2d3f8df6353cfd453c0948880e100c61ab9d..02c4b92bc75151fb24c987c4b0ad98a0787319c5 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTextAreaElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLFormElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.cpp
>index 91e277b229809ad822017e812eb660882348066a..96731d3f7cc4a3321b7cd44c8562e5caa4b43555 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLTitleElement.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLTitleElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.cpp
>index 6883e51d0c9736f2f71cd412b865de42425b128d..42ad67918b25569b9741534c99a227742b7f5d43 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMHTMLUListElement.cpp
>@@ -26,7 +26,7 @@
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
> #include <WebCore/HTMLNames.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMHTMLUListElementPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.cpp
>index 7da3263f0be32a516b0c9c3aaff18480335120cc..5ab25028810296d8e4c4c32a193dd5bf750b3d6f 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMKeyboardEvent.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMWindowPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMKeyboardEventPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp
>index 8731b99d902c9ef4b28194a57284aaa9bdccb248..25995548322572f6bd04d1212078d41e00dd831d 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMediaList.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMMediaListPrivate.h"
> #include "WebKitDOMPrivate.h"
> #include "ConvertToUTF8String.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.cpp
>index 217e565a4ab8631eed2f511511146d6a2018ec8d..a0238930b269dd989bf62ff212ea752232c5c165 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMMouseEvent.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMWindowPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTargetPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.cpp
>index baf658a6412d77366d8e0bc7a0e6f3fe4b0f2ee6..2b8ff9862385add6a84a03add5fbaf1f36436a8b 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNamedNodeMap.cpp
>@@ -29,7 +29,7 @@
> #include <WebCore/CSSImportRule.h>
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <wtf/GetPtr.h>
> #include <wtf/RefPtr.h>
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeGtk.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeGtk.cpp
>index 5f8622b695e4a61533c82ab62ead603891b2ae9d..6dd9f886adcb1a6c27eb5334f26421e65e977643 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeGtk.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeGtk.cpp
>@@ -32,7 +32,7 @@
> #include <WebCore/CSSImportRule.h>
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <WebCore/JSNode.h>
> #include <WebCore/SVGTests.h>
> #include <wtf/GetPtr.h>
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.cpp
>index df80db7aa7a6e38b49f6a17d35e41598eee0a1b0..6188eb1b967d60e2228dcfb79de393ee82406d23 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeIterator.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMNodeFilterPrivate.h"
> #include "WebKitDOMNodeIteratorPrivate.h"
> #include "WebKitDOMNodePrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.cpp
>index 0952218ddbd6cf114b9885c7508f7e00474ebf2d..ece2f70fee622474680d839b24dc350f872dc1b8 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMNodeList.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMNodeListPrivate.h"
> #include "WebKitDOMNodePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.cpp
>index ecc878e404e9e62ab43f14d4608f6c08b6dae6b0..8b119204a7494f66ab76ea47cb5aec4f6e914ae6 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMProcessingInstruction.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMNodePrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.cpp
>index beb435bb141c8fed8e826341a4ede055aff8e00d..0678cd43d361c487d6d8febcf4ce6da8667ec787 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMRange.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDocumentFragmentPrivate.h"
> #include "WebKitDOMNodePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.cpp
>index eb2405807530181bc61db5a0d862d7ccdbc100c6..51c0059454730d2e409eaff8597599edf59e5bee 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheet.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMMediaListPrivate.h"
> #include "WebKitDOMNodePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.cpp
>index 61d8db6966f2de1644a9454abce3f343ef1640e8..48c87db09e36958abc92d98fd72851fde9b1aa56 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMStyleSheetList.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMPrivate.h"
> #include "WebKitDOMStyleSheetListPrivate.h"
> #include "WebKitDOMStyleSheetPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp
>index 962087a26c0486461c4431364daab38a876c2472..04ef7c76c45babcb9137997e65cf9eab36c8f1ff 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMText.cpp
>@@ -25,7 +25,7 @@
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
> #include "GObjectEventListener.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMEventTarget.h"
> #include "WebKitDOMNodePrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.cpp
>index 867639146da9392fc05900d86e20a6f08148ceae..473fab11931c2b9a9682ba303ebacd6c9532064f 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMTreeWalker.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMNodeFilterPrivate.h"
> #include "WebKitDOMNodePrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.cpp
>index a0f6a90104d0eea3dff399517fc88b84b3914b4c..f0d812e7610b859f6c3a1814ae00b97f47705aa9 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMUIEvent.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include <WebCore/KeyboardEvent.h>
> #include "WebKitDOMDOMWindowPrivate.h"
> #include "WebKitDOMEventPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.cpp
>index e774cd167ecb3491141908e389dd50a25446cead..8d77bfc503274739ed268d494f8a747cfb068405 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMWheelEvent.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/Document.h>
> #include <WebCore/ExceptionCode.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMDOMWindowPrivate.h"
> #include "WebKitDOMEventPrivate.h"
> #include "WebKitDOMPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.cpp
>index 962b6e42654e7a1fc340d2c1c4ccbde5fa963471..9c91d5438210b027a286425d1c00f63b49c23656 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMNodePrivate.h"
> #include "WebKitDOMPrivate.h"
> #include "WebKitDOMXPathExpressionPrivate.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.cpp
>index fe9729801f3bd282558682aa9628cb304fa064af..53c7a9c5487226b56c5e75852b88c91cad92ad90 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.cpp
>@@ -21,7 +21,7 @@
> 
> #include "DOMObjectCache.h"
> #include "GObjectXPathNSResolver.h"
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMObject.h"
> #include "WebKitDOMXPathNSResolverPrivate.h"
> #include "ConvertToUTF8String.h"
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.cpp
>index 2c06a95faaf40ec4c7a4a2be18dbcf8bc7e14126..8ede06efca3504a4211bf34f0ab5d68bf1c09ad9 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.cpp
>@@ -24,7 +24,7 @@
> #include "DOMObjectCache.h"
> #include <WebCore/DOMException.h>
> #include <WebCore/Document.h>
>-#include <WebCore/JSMainThreadExecState.h>
>+#include <WebCore/JSExecState.h>
> #include "WebKitDOMNodePrivate.h"
> #include "WebKitDOMPrivate.h"
> #include "WebKitDOMXPathResultPrivate.h"
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMAttr.mm b/Source/WebKitLegacy/mac/DOM/DOMAttr.mm
>index 43923d72bd95fff706706fbcb30f77fc9f9d6ecf..e8f76f164e065f8028e9a6f67ea35d52eb7ec875 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMAttr.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMAttr.mm
>@@ -32,7 +32,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/Element.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/StyleProperties.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMBlob.mm b/Source/WebKitLegacy/mac/DOM/DOMBlob.mm
>index 75914db96724af946fee4f1aab7472f7b9be272a..4e6edc56a63ff4ca7cf4b46ce1c7724839113c6e 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMBlob.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMBlob.mm
>@@ -29,7 +29,7 @@
> #import "DOMInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCDATASection.mm b/Source/WebKitLegacy/mac/DOM/DOMCDATASection.mm
>index 49ba78af3365b9d0ad7aac5cf27f1582c81a68dc..1ea453f87eff47777023d1cf21fd1768d62b9efc 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCDATASection.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCDATASection.mm
>@@ -28,7 +28,7 @@
> #import <WebCore/CDATASection.h>
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <wtf/GetPtr.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSCharsetRule.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSCharsetRule.mm
>index 33ebdc06d040b4d43ec4483f34e0bd7224413cc6..d1b5eabd75d6fab6c7ccc7d66aff23d4c21201d4 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSCharsetRule.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSCharsetRule.mm
>@@ -28,7 +28,7 @@
> #import "DOMCSSRuleInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSFontFaceRule.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSFontFaceRule.mm
>index 9d1e59b5d9db3c2e099646b96ce9a0f3bb0734ab..ef26675a20cf52f5b05eee962a8d74c9990ebe47 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSFontFaceRule.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSFontFaceRule.mm
>@@ -31,7 +31,7 @@
> #import "DOMCSSStyleDeclarationInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/StyleProperties.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSImportRule.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSImportRule.mm
>index d2b366c6822086129b7163e535cec89949713b20..8804f24500bd6e8ef7c2b60e47067e6c92d3e003 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSImportRule.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSImportRule.mm
>@@ -32,7 +32,7 @@
> #import "DOMMediaListInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/MediaList.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSMediaRule.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSMediaRule.mm
>index 90596a5aecc3678a61bbf2e34e7859ff5d7dc24e..159a9a494987bd54519cbd62e430901a7d0c8c9e 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSMediaRule.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSMediaRule.mm
>@@ -32,7 +32,7 @@
> #import "DOMMediaListInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/MediaList.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSPageRule.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSPageRule.mm
>index 6f36336252f7a27f8c4f24efa5489efd10939821..f362231ce5bcfd6dea65f11d314c41bdc9f93429 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSPageRule.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSPageRule.mm
>@@ -31,7 +31,7 @@
> #import "DOMCSSStyleDeclarationInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/StyleProperties.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSPrimitiveValue.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSPrimitiveValue.mm
>index da1be95dc240a2f88fe8b0bfef6e391aef04f500..35a89349c32128bf93725b66fac4666488d6e058 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSPrimitiveValue.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSPrimitiveValue.mm
>@@ -35,7 +35,7 @@
> #import "DOMRGBColorInternal.h"
> #import "DOMRectInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSRule.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSRule.mm
>index 760fb5b1885e8a27283c9bb2ca72bfb29676a5b1..d48cb3f9229ddb2bd63dd99f091fd5bc5c652d0f 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSRule.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSRule.mm
>@@ -32,7 +32,7 @@
> #import "DOMCSSStyleSheetInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSRuleList.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSRuleList.mm
>index 3cac5c2ce81e03d50079e118d4c09056a0d4645d..8efde61f75217f12d0d57b2cc3069356d4dff9f0 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSRuleList.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSRuleList.mm
>@@ -32,7 +32,7 @@
> #import "DOMInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebCoreObjCExtras.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSStyleDeclaration.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSStyleDeclaration.mm
>index 0a0677df6a18198d5b7a29600d0cce00d7bb5574..2d9fefffc15400d98733133c8a374f1d6e938ef8 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSStyleDeclaration.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSStyleDeclaration.mm
>@@ -34,7 +34,7 @@
> #import "DOMInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSStyleRule.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSStyleRule.mm
>index fa10df1908611b2b0d377ed8b3fc8ca67db0b8e9..8a4cff30cdd55312f7dd427e5121a0661d10b909 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSStyleRule.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSStyleRule.mm
>@@ -31,7 +31,7 @@
> #import "DOMCSSStyleDeclarationInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/StyleProperties.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSStyleSheet.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSStyleSheet.mm
>index d1a1f0f1ef3fad889f387fe8611735c82ce60873..8c2406016c0ea5cebaeeadd6dfd99597151088ad 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSStyleSheet.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSStyleSheet.mm
>@@ -34,7 +34,7 @@
> #import "DOMNodeInternal.h"
> #import "DOMStyleSheetInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSUnknownRule.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSUnknownRule.mm
>index 6883e204e31085638a8f140d2f16830369fa01ab..db2337685e3d8169c74d738313c37ee4678011e3 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSUnknownRule.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSUnknownRule.mm
>@@ -29,7 +29,7 @@
> #import "DOMCSSRuleInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <wtf/GetPtr.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSValue.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSValue.mm
>index 799fb619a2ac66c9de2aeff28ffe8f4ad6eea16b..0c6e074d8f3d150500091b111dd9987c88aa738f 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSValue.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSValue.mm
>@@ -29,7 +29,7 @@
> #import "DOMInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCSSValueList.mm b/Source/WebKitLegacy/mac/DOM/DOMCSSValueList.mm
>index 138e531d762451ee0e4336a965c0a426a0e0e5e5..8c1aebc6b2569e9f6c3d24c266815882fa1e966c 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCSSValueList.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCSSValueList.mm
>@@ -29,7 +29,7 @@
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
> #import <WebCore/DeprecatedCSSOMValueList.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <wtf/GetPtr.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCharacterData.mm b/Source/WebKitLegacy/mac/DOM/DOMCharacterData.mm
>index 704aab95ad26e630899e09527e72a76b80250d8b..8c3b4d4a582fe947a0c38d064f9a1291b599c9c3 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCharacterData.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCharacterData.mm
>@@ -29,7 +29,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/Element.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMComment.mm b/Source/WebKitLegacy/mac/DOM/DOMComment.mm
>index f6012ee4be2a6aaecf757ba3c93bba94b7cdf1b7..e25d26120e608c3e58614b5c07992fdad3d42895 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMComment.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMComment.mm
>@@ -28,7 +28,7 @@
> #import <WebCore/Comment.h>
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <wtf/GetPtr.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMCounter.mm b/Source/WebKitLegacy/mac/DOM/DOMCounter.mm
>index b0e4af42e2d8e76acc2c5913221ce2f2116b52ec..2d1e5657ea2d668d2005b53c4859edd9d52f8bf8 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMCounter.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMCounter.mm
>@@ -29,7 +29,7 @@
> #import "DOMInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMDocument.mm b/Source/WebKitLegacy/mac/DOM/DOMDocument.mm
>index e53e9d8b6d3fcd36ae0ce67ceaf04a33cf513be2..cf3056102bd9ebdb13b2008296cad479cab4eae8 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMDocument.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMDocument.mm
>@@ -68,7 +68,7 @@
> #import <WebCore/HTMLElement.h>
> #import <WebCore/HTMLHeadElement.h>
> #import <WebCore/HTMLScriptElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NameNodeList.h>
> #import <WebCore/NativeNodeFilter.h>
> #import <WebCore/Node.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMDocumentFragment.mm b/Source/WebKitLegacy/mac/DOM/DOMDocumentFragment.mm
>index 1fd7ea99f224893b9b002dd0840c0f3965333550..96d0329b49ae615b71efaa4c05b26911de85c17d 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMDocumentFragment.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMDocumentFragment.mm
>@@ -33,7 +33,7 @@
> #import <WebCore/Element.h>
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLCollection.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NameNodeList.h>
> #import <WebCore/NodeList.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMDocumentType.mm b/Source/WebKitLegacy/mac/DOM/DOMDocumentType.mm
>index ee56f643a7e05938d02950a770201f338007ba68..e201176a92dc66640cd501ef7ec20acd8464af92 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMDocumentType.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMDocumentType.mm
>@@ -29,7 +29,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/DocumentType.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NamedNodeMap.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMElement.mm b/Source/WebKitLegacy/mac/DOM/DOMElement.mm
>index cd1ed0d94e0f20f1c5f879580d7f3ecedfb0ff04..718b1352861242ab37963879985fe56246494e62 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMElement.mm
>@@ -37,7 +37,7 @@
> #import <WebCore/Element.h>
> #import <WebCore/HTMLCollection.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NameNodeList.h>
> #import <WebCore/NodeList.h>
> #import <WebCore/StyleProperties.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMEvent.mm
>index 9aca41b65fa85ca8e08f0f61f0ccb1ccd1c2a806..60cdb6e57f5be1760f4d915d38ae4a33557517cd 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMEvent.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/Event.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/Node.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMFile.mm b/Source/WebKitLegacy/mac/DOM/DOMFile.mm
>index 6bf57b414e60cdc2acc747cdc50ebaa39c9dfe79..eda87fff1c4e4b5a9a87c6db8b402ac4b24b287f 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMFile.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMFile.mm
>@@ -29,7 +29,7 @@
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
> #import <WebCore/File.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMFileList.mm b/Source/WebKitLegacy/mac/DOM/DOMFileList.mm
>index a2674fe7f902b79a94dbd751c81c00dd292a24e4..c0ac825b63d1f9db4e96bff0609084310c06ea06 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMFileList.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMFileList.mm
>@@ -31,7 +31,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/File.h>
> #import <WebCore/FileList.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebCoreObjCExtras.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTML.mm b/Source/WebKitLegacy/mac/DOM/DOMHTML.mm
>index 7a5f98146a23407d51f120abb87029270cf11d61..e1c335bf1a2a859d34eaf98d559fb811857dd7ea 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTML.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTML.mm
>@@ -51,7 +51,7 @@
> #import "DOMHTMLElementInternal.h"
> #import <WebCore/Autocapitalize.h>
> #import <WebCore/HTMLTextFormControlElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/RenderLayer.h>
> #import <WebCore/WAKWindow.h>
> #import <WebCore/WebCoreThreadMessage.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLAnchorElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLAnchorElement.mm
>index 23d1156f50e2662e73adc577b54133ee47fba515..4460f27c6dfdd306560c124d9d79941c8d5c852d 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLAnchorElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLAnchorElement.mm
>@@ -32,7 +32,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLAnchorElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLAppletElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLAppletElement.mm
>index d6b2aa19eceac32b807acb395e2c7d4cf2fadaae..a84542da47d644dc362e8fd1dfb52d06b213a64a 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLAppletElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLAppletElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLAppletElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLAreaElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLAreaElement.mm
>index 1f2adac6c868ea1caf8bfd0344c4d9eadee1b9e6..c4ab23202757efc226d347e50a210dd43e12052e 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLAreaElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLAreaElement.mm
>@@ -32,7 +32,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLAreaElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLBRElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLBRElement.mm
>index ace786e9112eec5d2b1fcfb1580141552a8cd448..cf5b3e0884139c98e4b78cb378df1a67c43598b8 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLBRElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLBRElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLBRElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLBaseElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLBaseElement.mm
>index 65c357331b39d7ebec0e264f9ebdd69fcafafe5a..514b7091b43d122772d070c77e6a11df48006c13 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLBaseElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLBaseElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLBaseElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLBaseFontElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLBaseFontElement.mm
>index 8c2fd303876956f072c76edd015bcefd2ecff047..a99c0b62381f251c21e807685fb9350306711a4d 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLBaseFontElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLBaseFontElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLUnknownElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLBodyElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLBodyElement.mm
>index 61c68f89b60473d01582778bab94bf1a58d9d6fa..695293b42463fbe66287b064764ef69dfe58f704 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLBodyElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLBodyElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLBodyElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLButtonElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLButtonElement.mm
>index 7cf60f4a166862382e44e80525d274c172ccaba9..98aa27c56275c543cd4d9e2fbb27c18db9d82ab5 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLButtonElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLButtonElement.mm
>@@ -32,7 +32,7 @@
> #import <WebCore/HTMLButtonElement.h>
> #import <WebCore/HTMLFormElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NameNodeList.h>
> #import <WebCore/NodeList.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLCanvasElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLCanvasElement.mm
>index 3e371eea84bd1c3e139fd8c97a23a04787d72a26..0fd60a6da8aaaabe74d2bd2bd9479b814bd96351 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLCanvasElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLCanvasElement.mm
>@@ -28,7 +28,7 @@
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLCanvasElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/StringAdaptors.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLCollection.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLCollection.mm
>index 7fe73819bdd44575cdd12de74a232a61058859c7..e344098cb48e2d390f540bc1d50e6973cc43d7f1 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLCollection.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLCollection.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeListInternal.h"
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLCollection.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NameNodeList.h>
> #import <WebCore/Node.h>
> #import <WebCore/NodeList.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLDListElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLDListElement.mm
>index d09570e47122c2de760878ab2de48e3e0aa2936b..2e738510726262aa223f3a2fbe1d14399c3bb328 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLDListElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLDListElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLDListElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <wtf/GetPtr.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLDirectoryElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLDirectoryElement.mm
>index 4e589a6cc79432b305f9828ab3c7eb22c864340a..228d418af13a2cdbe681670b935472300e7ded73 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLDirectoryElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLDirectoryElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLDirectoryElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <wtf/GetPtr.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLDivElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLDivElement.mm
>index 57d41d552bd4768cd89aa923ef859d6853cd3890..2936afac02531858d1fb8a94d272fff95ce949dd 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLDivElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLDivElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLDivElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLDocument.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLDocument.mm
>index 7d8dac7d9398021024ece76f692af143316572c0..0375a3cf4fd671f6336fbb37c9bb7c9aef01763d 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLDocument.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLDocument.mm
>@@ -30,7 +30,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLCollection.h>
> #import <WebCore/HTMLDocument.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLElement.mm
>index 7330dc15ce42cd3310c7c5cf04be1885eafb539a..a5e0cd31913bd387326635e7935f4aa89819c6f0 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLElement.mm
>@@ -34,7 +34,7 @@
> #import <WebCore/HTMLElement.h>
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HitTestResult.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLEmbedElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLEmbedElement.mm
>index 280e05611ea08699d3b1936e1e46ab200eb6822b..6b82be08e82166c31940a348ecf97258259cc9d0 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLEmbedElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLEmbedElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLEmbedElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLFieldSetElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLFieldSetElement.mm
>index a42cf3126ba842e0f3ac243cd4d325fd02bcddaa..ea92a019a5065695c6446ada49395f6fa3ae2666 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLFieldSetElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLFieldSetElement.mm
>@@ -34,7 +34,7 @@
> #import <WebCore/HTMLFieldSetElement.h>
> #import <WebCore/HTMLFormElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/ValidityState.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLFontElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLFontElement.mm
>index 2f45c2c3954dfb260238d4fc7e4bdfcec4ab35ba..80de490549248033a32bfca038b3af7719c6fb76 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLFontElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLFontElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLFontElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLFormElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLFormElement.mm
>index dd431c4ecdbbc7c8ae5f91cac490764576a369bd..bfde1dad814eddcbea7657afb78cd34f7bedd56f 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLFormElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLFormElement.mm
>@@ -31,7 +31,7 @@
> #import <WebCore/HTMLCollection.h>
> #import <WebCore/HTMLFormElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLFrameElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLFrameElement.mm
>index 977eb4a6b82967d4d8bdd8befb3b0197d549e686..600f44f89bc43997dc40e006d26cc352e381aaf1 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLFrameElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLFrameElement.mm
>@@ -33,7 +33,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLFrameElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLFrameSetElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLFrameSetElement.mm
>index be8d89a1d44b0df22720aee9beb780ee76ae63da..f2f207f052497c2197b743477c3cbb3126ffc98a 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLFrameSetElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLFrameSetElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLFrameSetElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLHRElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLHRElement.mm
>index d4d03eacda702773b563c196b6b6413cbc158518..b2578aa2df3ee890085612fc217735835265b76d 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLHRElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLHRElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLHRElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLHeadElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLHeadElement.mm
>index 65e508d9e42371d885c3efa01aa1516bdc2d0afb..bef39ae5706f949acd27f41b5d0bb27eee2fd2a7 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLHeadElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLHeadElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLHeadElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLHeadingElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLHeadingElement.mm
>index 5c4e3b6a6392f618c9e00566d083892806618f53..811bb18048861f8b1712c9356c1d8276d0113189 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLHeadingElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLHeadingElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLHeadingElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLHtmlElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLHtmlElement.mm
>index 4d2844104e18de71fde57489fd5b4705a2781771..287ce7f94ff2e9c965f35fde43350cd4ab3cbc1f 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLHtmlElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLHtmlElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLHtmlElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLIFrameElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLIFrameElement.mm
>index b1b2c0318b20b728be5177612c4ac7a39d721a6d..f382c9ef8e096923a630e5dbbd597267f1e169df 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLIFrameElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLIFrameElement.mm
>@@ -33,7 +33,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLIFrameElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLImageElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLImageElement.mm
>index 1800d6d061d8510db49f98eb8b7ffcf9f7537955..fc91953cecc2caeee762b345420241bbf9b37151 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLImageElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLImageElement.mm
>@@ -31,7 +31,7 @@
> #import <WebCore/HTMLImageElement.h>
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HitTestResult.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLInputElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLInputElement.mm
>index ec2e10a30521d2fb46581ed892873c72c9e1a75d..8363735d9474a86ba8a805e0f1a3eba6f84d4bcd 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLInputElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLInputElement.mm
>@@ -59,7 +59,7 @@ @end
> #import <WebCore/HTMLInputElement.h>
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HitTestResult.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NameNodeList.h>
> #import <WebCore/NodeList.h>
> #import <WebCore/RenderElement.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLLIElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLLIElement.mm
>index 617330e75205e05f646bcea1009ad55da4d5926b..269d1a54add8ce2bd4feaf6a42a63982085feda0 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLLIElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLLIElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLLIElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLLabelElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLLabelElement.mm
>index ee1a597607a58a28a313182c53cc81424efe96c6..51f560c09791893ae66dc552d2f9697d2fbf0281 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLLabelElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLLabelElement.mm
>@@ -33,7 +33,7 @@
> #import <WebCore/HTMLFormElement.h>
> #import <WebCore/HTMLLabelElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLLegendElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLLegendElement.mm
>index f9e8dd147c9fc0a56a0b1a22098857f230871b54..9343ca6e9dfaf73780657cf542ae1225452d8b0c 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLLegendElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLLegendElement.mm
>@@ -31,7 +31,7 @@
> #import <WebCore/HTMLFormElement.h>
> #import <WebCore/HTMLLegendElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLLinkElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLLinkElement.mm
>index 38193352adecc9b3224fc3f51bd67e664f65052e..20f4c01515deb60ee4db379a005e52779b9c5220 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLLinkElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLLinkElement.mm
>@@ -33,7 +33,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLLinkElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/StyleSheet.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLMapElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLMapElement.mm
>index cf33b0ef3a5661d2791cd9915508da7b21a0674d..b921b3a50ed051503f3d77c450bd39716ad4c960 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLMapElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLMapElement.mm
>@@ -31,7 +31,7 @@
> #import <WebCore/HTMLCollection.h>
> #import <WebCore/HTMLMapElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLMarqueeElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLMarqueeElement.mm
>index d0d3ea8e896839b074de0237a7b9428af1f261cb..61ab4c62333f956e0724362772fc1fffca46a238 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLMarqueeElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLMarqueeElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLMarqueeElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLMediaElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLMediaElement.mm
>index a1d211efb4d2a4050b6989eea6771ee2068000c0..5bc7456f60cf7612b506ebfd3dc89fa47aeca467 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLMediaElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLMediaElement.mm
>@@ -34,7 +34,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLMediaElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/MediaError.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/TimeRanges.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLMenuElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLMenuElement.mm
>index e32b6128f1de426746c3bebabc0efb3ac7896d25..1eecbaa3974a746356e8c27c0ef1cb985f941222 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLMenuElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLMenuElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLMenuElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <wtf/GetPtr.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLMetaElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLMetaElement.mm
>index 84e8fb3742e139ed33334ee1cbf52f39e905e99d..9987002af7cbe3d14d67cf8c4f3b81de3d3bf26c 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLMetaElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLMetaElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLMetaElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLModElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLModElement.mm
>index c2c6fa48e928608dbb308568f188f0faac398ad4..d885fcfd08036c738292e0070721ee5f82e3719a 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLModElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLModElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLModElement.h>
> #import <WebCore/HTMLNames.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLOListElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLOListElement.mm
>index 321f3ff112f7137307707dab284598abcf556aa5..a32c2d8bc97121707b6e0e378e7451522c558730 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLOListElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLOListElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLOListElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLObjectElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLObjectElement.mm
>index a9d033382694dce29ac412183dfd2b72c7954617..7ab73f5729430d3bf2027edbc5e4610314bdca15 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLObjectElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLObjectElement.mm
>@@ -34,7 +34,7 @@
> #import <WebCore/HTMLFormElement.h>
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLObjectElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/RenderElement.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLOptGroupElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLOptGroupElement.mm
>index 5c6e4970650c1145384e9f5692df38445d1ae0a3..4e515daf55bb7cc5cc038bb52404b6eef1b55cdb 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLOptGroupElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLOptGroupElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLOptGroupElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLOptionElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLOptionElement.mm
>index 5bd2ef03c37ac5a5890934ae5dd24292e92824e6..fdec54ee1d64781e66e88334c52cf5418bc793df 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLOptionElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLOptionElement.mm
>@@ -31,7 +31,7 @@
> #import <WebCore/HTMLFormElement.h>
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLOptionElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLOptionsCollection.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLOptionsCollection.mm
>index fdfa6e8fc33a7b9bd62ba80cc09557bf2abbefcd..f770a8a14d5a83d7695e43719ee1af4dcb664ca1 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLOptionsCollection.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLOptionsCollection.mm
>@@ -32,7 +32,7 @@
> #import <WebCore/HTMLOptGroupElement.h>
> #import <WebCore/HTMLOptionElement.h>
> #import <WebCore/HTMLOptionsCollection.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/Node.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLParagraphElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLParagraphElement.mm
>index 024cf475b652ab7bb2f157b2e4110d0ab4f04f44..6c511e91664ce923cc9284a255a11e6a793b3fd4 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLParagraphElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLParagraphElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLParagraphElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLParamElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLParamElement.mm
>index 166c7512c21a5f8e6aa95c61aa7c79ad293db8c4..5fb0cec27fb7097f0915ee5cdfc418a81c594fe8 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLParamElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLParamElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLParamElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLPreElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLPreElement.mm
>index f5ee9b4a53105824f160f9748522e703b1eac274..de6eb328a892cd0699f6a46389f557cf6e568710 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLPreElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLPreElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLPreElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <wtf/GetPtr.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLQuoteElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLQuoteElement.mm
>index 0ea0f834a03cc5b09f7ed3bba2ae9ccc2e2e885c..3749c180330fb0e35cd545911c09e7745875afd0 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLQuoteElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLQuoteElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLQuoteElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLScriptElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLScriptElement.mm
>index 4f75e01063b680310a06831e7c853888efe781cd..3344d5488849c14c91c5a693e79ad7e670e09ff4 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLScriptElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLScriptElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLScriptElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLSelectElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLSelectElement.mm
>index a0423d4227c7b298c39dd7789f01cd82f0aa6580..758141de3fb7f5abf6e2a28fa6aea14658c66962 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLSelectElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLSelectElement.mm
>@@ -39,7 +39,7 @@
> #import <WebCore/HTMLOptGroupElement.h>
> #import <WebCore/HTMLOptionsCollection.h>
> #import <WebCore/HTMLSelectElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NameNodeList.h>
> #import <WebCore/Node.h>
> #import <WebCore/NodeList.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLStyleElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLStyleElement.mm
>index 65fc31af177c3c6b83ea272d9b4832704bf0c603..a452782080bb639c4e67f4579f93946568c5cf10 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLStyleElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLStyleElement.mm
>@@ -30,7 +30,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLStyleElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/StyleSheet.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableCaptionElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableCaptionElement.mm
>index 7bbf22b8ef05eb63e5f78cdf570a95b92e32c1fa..a7811bd68b388b8d7331d453c9628608a5a36e37 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableCaptionElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableCaptionElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLTableCaptionElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableCellElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableCellElement.mm
>index a91e2f84e4728247f420e013c1ab84ee9b052909..dd3016b3aa63a4f9b03144075f05e5a980558ee0 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableCellElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableCellElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLTableCellElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableColElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableColElement.mm
>index 4da69602ce2111abd08232b00716602a44524426..af26714d84f30aadcae142be846d66ce6e35e40a 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableColElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableColElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLTableColElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableElement.mm
>index dd3b06f2ff91a76283ddf514226f35898096877e..4c68c4b6b4ca5d6f1f610ec5ac07fa6d347320c9 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableElement.mm
>@@ -37,7 +37,7 @@
> #import <WebCore/HTMLTableCaptionElement.h>
> #import <WebCore/HTMLTableElement.h>
> #import <WebCore/HTMLTableSectionElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableRowElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableRowElement.mm
>index d54c2a740934b2e1377bac8148f1f853e035a0cc..24096a8d9947fd7b7a24fd1657313a98409938cc 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableRowElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableRowElement.mm
>@@ -33,7 +33,7 @@
> #import <WebCore/HTMLElement.h>
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLTableRowElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableSectionElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableSectionElement.mm
>index 5fe4fde647bf1ffb629a362389c694e20b4d6184..98b19fa3154034dad9f630b343222882834f3188 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLTableSectionElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLTableSectionElement.mm
>@@ -33,7 +33,7 @@
> #import <WebCore/HTMLElement.h>
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLTableSectionElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLTextAreaElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLTextAreaElement.mm
>index 14935af3f1ca0b9993768e2ec32f1b063e2aebe4..503d901e86389a56596253b0e9a3f3d13aa3d76d 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLTextAreaElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLTextAreaElement.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeListInternal.h"
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLTextAreaElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NodeList.h>
> #import <WebCore/ThreadCheck.h>
> 
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLTitleElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLTitleElement.mm
>index 0881c562cc5b27eb2742ef697ea39a7ebe5640a5..2486f77c3a5e750427102ad27e282b6b65b4efe9 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLTitleElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLTitleElement.mm
>@@ -28,7 +28,7 @@
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLTitleElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLUListElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLUListElement.mm
>index 0873cc4d6ee735eee3342627982ade4e5733d70f..f98f8e852bd47a16292b973409015728e45f33a1 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLUListElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLUListElement.mm
>@@ -29,7 +29,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLUListElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTMLVideoElement.mm b/Source/WebKitLegacy/mac/DOM/DOMHTMLVideoElement.mm
>index 06dafc9345f7889a6102eca921a8b97320364dbd..335806503928719b95b0f7167f271a901e85c119 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMHTMLVideoElement.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMHTMLVideoElement.mm
>@@ -32,7 +32,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/HTMLNames.h>
> #import <WebCore/HTMLVideoElement.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMImplementation.mm b/Source/WebKitLegacy/mac/DOM/DOMImplementation.mm
>index 7442ea9ade027704e1bcd2bbd8f2b13562d73d0c..732cf438bd6211eab32f46219ac189acbbc99cae 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMImplementation.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMImplementation.mm
>@@ -35,7 +35,7 @@
> #import <WebCore/DOMImplementation.h>
> #import <WebCore/DocumentType.h>
> #import <WebCore/HTMLDocument.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/SVGTests.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMKeyboardEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMKeyboardEvent.mm
>index ba2fbe4e189d6136eed735efffe7120b7f96958e..3fd8fce36466f37ab9a194c0a30c1c3c4052f63c 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMKeyboardEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMKeyboardEvent.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/DOMWindow.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/KeyboardEvent.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMMediaError.mm b/Source/WebKitLegacy/mac/DOM/DOMMediaError.mm
>index 139556c55aad84302aa3478ab58d70524d4d206f..a927fb234bde0fb5d506d879135bbd0aa0b66eda 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMMediaError.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMMediaError.mm
>@@ -34,7 +34,7 @@
> #import "DOMMediaErrorInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/MediaError.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMMediaList.mm b/Source/WebKitLegacy/mac/DOM/DOMMediaList.mm
>index 2df34205b6bf3a8d177cc13181217efb958d7dda..9e8167a16a44b3137b23edb1a8eed45949d27d98 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMMediaList.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMMediaList.mm
>@@ -30,7 +30,7 @@
> #import "DOMMediaListInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/MediaList.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMMouseEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMMouseEvent.mm
>index e515d8935c177d471094a84c5cfb8d64db294389..f656a8ade5535a90e87abcaab9d8079963a81206 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMMouseEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMMouseEvent.mm
>@@ -32,7 +32,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/DOMWindow.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/MouseEvent.h>
> #import <WebCore/Node.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMMutationEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMMutationEvent.mm
>index c8612d694a638cf0a964b889e3c0c12c4cfc141f..0f4ef1675a1c03a87a10d61e3fb711aaf11c76bd 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMMutationEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMMutationEvent.mm
>@@ -28,7 +28,7 @@
> #import "DOMEventInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/MutationEvent.h>
> #import <WebCore/Node.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMNamedNodeMap.mm b/Source/WebKitLegacy/mac/DOM/DOMNamedNodeMap.mm
>index 5dd39564dd4f4f2396f36b727936d83c5a8565b9..56819332bb6742e1efedd01e2c7533577d71e3f8 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMNamedNodeMap.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMNamedNodeMap.mm
>@@ -29,7 +29,7 @@
> #import "DOMInternal.h"
> #import "ExceptionHandlers.h"
> #import <WebCore/Attr.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NamedNodeMap.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMNode.mm b/Source/WebKitLegacy/mac/DOM/DOMNode.mm
>index ec130f4f463be7262de29cbfca96b4a82d259aee..25e47846d1678ccf4280c37c278febc1b37f336f 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMNode.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMNode.mm
>@@ -35,7 +35,7 @@
> #import "ObjCEventListener.h"
> #import <WebCore/DOMImplementation.h>
> #import <WebCore/Element.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NodeList.h>
> #import <WebCore/SVGTests.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMNodeIterator.mm b/Source/WebKitLegacy/mac/DOM/DOMNodeIterator.mm
>index 6cb2b242e6811afe76f15b2066b0def5a67a6f02..d77f27bf81d0f8672e8645be3b7972468f45057b 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMNodeIterator.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMNodeIterator.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeInternal.h"
> #import "DOMNodeIteratorInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NativeNodeFilter.h>
> #import <WebCore/Node.h>
> #import <WebCore/NodeIterator.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMNodeList.mm b/Source/WebKitLegacy/mac/DOM/DOMNodeList.mm
>index 1bbf01bf79485e93d66f70760bf3d23a08ad6131..bc95dd60c94c4f111f9c4e2bb8e9285ad42105cf 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMNodeList.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMNodeList.mm
>@@ -28,7 +28,7 @@
> #import "DOMInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/Node.h>
> #import <WebCore/NodeList.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMOverflowEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMOverflowEvent.mm
>index 62f9d011632aad60c0535ebfd229063f8ac39e31..08ab37a213d897a974800c793754007c374c1be4 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMOverflowEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMOverflowEvent.mm
>@@ -28,7 +28,7 @@
> #import "DOMEventInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/OverflowEvent.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMProcessingInstruction.mm b/Source/WebKitLegacy/mac/DOM/DOMProcessingInstruction.mm
>index 8b6c6b55c80edcf27edd215d7b265bed085e8bf4..9adc40b08abbc8771b3c8b8bdfee019fc81ce325 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMProcessingInstruction.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMProcessingInstruction.mm
>@@ -28,7 +28,7 @@
> #import "DOMNodeInternal.h"
> #import "DOMStyleSheetInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ProcessingInstruction.h>
> #import <WebCore/StyleSheet.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMProgressEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMProgressEvent.mm
>index 31a09b5a4b826ab2b9b3090e1894f5a668bb0fd8..f4b3317eb8b2580e2dacbad9ae29c9ada47f078f 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMProgressEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMProgressEvent.mm
>@@ -28,7 +28,7 @@
> #import "DOMEventInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ProgressEvent.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMRGBColor.mm b/Source/WebKitLegacy/mac/DOM/DOMRGBColor.mm
>index 8ab7a52e8749ba2087dec58b03e178c92a5bfd91..ea66291bd7eee91037f3ad1462ba01267b1cbaaa 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMRGBColor.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMRGBColor.mm
>@@ -31,7 +31,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/DeprecatedCSSOMPrimitiveValue.h>
> #import <WebCore/DeprecatedCSSOMRGBColor.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebCoreObjCExtras.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMRange.mm b/Source/WebKitLegacy/mac/DOM/DOMRange.mm
>index 24f85f71f6ede824e5f458cb645739e4f4b6a6df..f289b3a26e8a4f566b6724fb8d6151158bdb62e8 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMRange.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMRange.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/DocumentFragment.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/Node.h>
> #import <WebCore/Range.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMRect.mm b/Source/WebKitLegacy/mac/DOM/DOMRect.mm
>index 58bbcd57664970adf9cd86a271c60fc42f907f86..e054a2be38da7bbca132f94a3dfd210e15cfadb2 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMRect.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMRect.mm
>@@ -31,7 +31,7 @@
> #import "ExceptionHandlers.h"
> #import <WebCore/DeprecatedCSSOMPrimitiveValue.h>
> #import <WebCore/DeprecatedCSSOMRect.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebCoreObjCExtras.h>
> #import <WebCore/WebScriptObjectPrivate.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMStyleSheet.mm b/Source/WebKitLegacy/mac/DOM/DOMStyleSheet.mm
>index 526ad97ec03aebe9dd885417ec88ae5c4163962c..7a1a4a87fc6ef249acb9d07de254bdb2b0a3c933 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMStyleSheet.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMStyleSheet.mm
>@@ -31,7 +31,7 @@
> #import "DOMNodeInternal.h"
> #import "DOMStyleSheetInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/MediaList.h>
> #import <WebCore/Node.h>
> #import <WebCore/StyleSheet.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMStyleSheetList.mm b/Source/WebKitLegacy/mac/DOM/DOMStyleSheetList.mm
>index a0539a6e85d6e114284ea63aa25e83dabd39f4fe..cda37e9b84f16507411bb4347f80677c4e11e672 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMStyleSheetList.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMStyleSheetList.mm
>@@ -31,7 +31,7 @@
> #import "DOMStyleSheetInternal.h"
> #import "DOMStyleSheetListInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/StyleSheet.h>
> #import <WebCore/StyleSheetList.h>
> #import <WebCore/ThreadCheck.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMText.mm b/Source/WebKitLegacy/mac/DOM/DOMText.mm
>index 404a8a437ce01cbfb99a56bad24624ab1f724a01..30e7da3c0c98973d4125a67eddcd26d9cee75cb5 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMText.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMText.mm
>@@ -27,7 +27,7 @@
> 
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/Text.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMTextEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMTextEvent.mm
>index dfa762024b56622ce5b2991df312dfd53870d0e3..c5026eb4b2f860133287b9f2e058a761fb24204f 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMTextEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMTextEvent.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/DOMWindow.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/TextEvent.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMTimeRanges.mm b/Source/WebKitLegacy/mac/DOM/DOMTimeRanges.mm
>index f0836202dcb3de5e9b9ffa6bea7dff522c91a1ff..07a8876404fec55801f45a48a3cb03c51ab3e41d 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMTimeRanges.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMTimeRanges.mm
>@@ -33,7 +33,7 @@
> #import "DOMNodeInternal.h"
> #import "DOMTimeRangesInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/TimeRanges.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMTokenList.mm b/Source/WebKitLegacy/mac/DOM/DOMTokenList.mm
>index a7196c6d02351c3a07691fe66419c69591ab6c58..db8f55ce07aa64fd929a5f5f83ff0cbccdd77468 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMTokenList.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMTokenList.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/DOMTokenList.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMTreeWalker.mm b/Source/WebKitLegacy/mac/DOM/DOMTreeWalker.mm
>index de0419fe9d1026eccf1437a57201cf480b20d55b..580c56039f09f4c2c2d9038450ed14a112783be7 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMTreeWalker.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMTreeWalker.mm
>@@ -28,7 +28,7 @@
> #import "DOMInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/NativeNodeFilter.h>
> #import <WebCore/Node.h>
> #import "ObjCNodeFilterCondition.h"
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMUIEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMUIEvent.mm
>index 3dc97b3937847d0acb0e0cd2ea99c91fd126f66d..173243190a32b15c47fffe002b3ba6167b1778db 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMUIEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMUIEvent.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
> #import <WebCore/DOMWindow.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/KeyboardEvent.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/UIEvent.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMWheelEvent.mm b/Source/WebKitLegacy/mac/DOM/DOMWheelEvent.mm
>index dd4a57b0f32b77b430b6dd9cd5b15234e5a434bb..5bd922868a88a315e769029cb4f2a63ba25866e6 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMWheelEvent.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMWheelEvent.mm
>@@ -30,7 +30,7 @@
> #import "DOMNodeInternal.h"
> #import <WebCore/DOMWindow.h>
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebScriptObjectPrivate.h>
> #import <WebCore/WheelEvent.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMXPathExpression.mm b/Source/WebKitLegacy/mac/DOM/DOMXPathExpression.mm
>index 0e0e0695763ad115c4bbe32473eae8403e4bc069..13993b4d30257d16e0b84d845fa6c23a60460c6e 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMXPathExpression.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMXPathExpression.mm
>@@ -29,7 +29,7 @@
> #import "DOMNodeInternal.h"
> #import "DOMXPathResultInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/Node.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/WebCoreObjCExtras.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/DOMXPathResult.mm b/Source/WebKitLegacy/mac/DOM/DOMXPathResult.mm
>index 9e21ffc81ad740bdec90ba19bbff0699a651178a..a1ef573f8dd2c10b686c119509a70242d7cf52af 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOMXPathResult.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOMXPathResult.mm
>@@ -28,7 +28,7 @@
> #import "DOMInternal.h"
> #import "DOMNodeInternal.h"
> #import "ExceptionHandlers.h"
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <WebCore/Node.h>
> #import <WebCore/ThreadCheck.h>
> #import <WebCore/URL.h>
>diff --git a/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm b/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm
>index 40b303cb69a70ac1f535e225cbc63871c79acb91..8f7a46781ff1f60959ac60a5e81830fe8111f487 100644
>--- a/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm
>+++ b/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm
>@@ -31,7 +31,7 @@
> #import "DOMEventListener.h"
> #import <WebCore/Event.h>
> #import <WebCore/EventListener.h>
>-#import <WebCore/JSMainThreadExecState.h>
>+#import <WebCore/JSExecState.h>
> #import <wtf/HashMap.h>
> 
> namespace WebCore {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 84ca9a586d8a48add8667b3e70fa1033205b4eb1..5292eedd714059af693c228f808e0e7271fc392d 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-03  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        Add the support for micro tasks in workers
>+        https://bugs.webkit.org/show_bug.cgi?id=188246
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/wpt/workers/microtasks.any-expected.txt: Added.
>+        * http/wpt/workers/microtasks.any.html: Added.
>+        * http/wpt/workers/microtasks.any.js: Added.
>+        (promise_test):
>+        * http/wpt/workers/microtasks.any.worker-expected.txt: Added.
>+        * http/wpt/workers/microtasks.any.worker.html: Added.
>+
> 2018-08-03  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [LayoutTests][websocket] Return correct value even when cookie is not set.
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index 24095313f8ba258d1d2ee33421bf60ba8711a8f9..e6b56c152044e5cf6d8d37ed3bf0bed1873aa855 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-03  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        Add the support for micro tasks in workers
>+        https://bugs.webkit.org/show_bug.cgi?id=188246
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This test is wrong[1,2]. It starts failing since our worker starts using correct microtask queues.
>+
>+        [1]: https://github.com/web-platform-tests/wpt/pull/8936
>+        [2]: https://github.com/w3c/ServiceWorker/issues/1213#issuecomment-342640579
>+
>+        * web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https-expected.txt:
>+
> 2018-08-02  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Release assert when throwing exceptions in custom element reactions
>diff --git a/LayoutTests/http/wpt/workers/microtasks.any-expected.txt b/LayoutTests/http/wpt/workers/microtasks.any-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..e889b21d3de1b855cbd83e254064acd7e1ea653c
>--- /dev/null
>+++ b/LayoutTests/http/wpt/workers/microtasks.any-expected.txt
>@@ -0,0 +1,5 @@
>+
>+PASS Microtasks should be executed earlier than macrotasks. 
>+PASS Nested microtasks should be executed earlier than macrotasks. 
>+PASS Microtasks should be executed in queued order. 
>+
>diff --git a/LayoutTests/http/wpt/workers/microtasks.any.html b/LayoutTests/http/wpt/workers/microtasks.any.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2382913528e693b3a5d56c660a45060980b548c3
>--- /dev/null
>+++ b/LayoutTests/http/wpt/workers/microtasks.any.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/http/wpt/workers/microtasks.any.js b/LayoutTests/http/wpt/workers/microtasks.any.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..3e1e0366adcf2cf67186e279e7ae460d8e5a4a61
>--- /dev/null
>+++ b/LayoutTests/http/wpt/workers/microtasks.any.js
>@@ -0,0 +1,51 @@
>+promise_test(() => {
>+    var counter = 0;
>+    var promise = new Promise(function (resolve) {
>+        setTimeout(function () {
>+            assert_equals(counter++, 3);
>+            resolve();
>+        }, 0);
>+        Promise.resolve().then(function () {
>+            assert_equals(counter++, 2);
>+        });
>+        assert_equals(counter++, 0);
>+    });
>+    assert_equals(counter++, 1);
>+    return promise;
>+}, "Microtasks should be executed earlier than macrotasks.");
>+
>+promise_test(() => {
>+    var counter = 0;
>+    var promise = new Promise(function (resolve) {
>+        setTimeout(function () {
>+            assert_equals(counter++, 4);
>+            resolve();
>+        }, 0);
>+        Promise.resolve().then(function () {
>+            Promise.resolve().then(function () {
>+                assert_equals(counter++, 3);
>+            });
>+            assert_equals(counter++, 2);
>+        });
>+        assert_equals(counter++, 0);
>+    });
>+    assert_equals(counter++, 1);
>+    return promise;
>+}, "Nested microtasks should be executed earlier than macrotasks.");
>+
>+promise_test(() => {
>+    var counter = 0;
>+    return new Promise(function (resolve) {
>+        Promise.resolve().then(function () {
>+            assert_equals(counter++, 1);
>+        });
>+        Promise.resolve().then(function () {
>+            assert_equals(counter++, 2);
>+        });
>+        Promise.resolve().then(function () {
>+            assert_equals(counter++, 3);
>+            resolve();
>+        });
>+        assert_equals(counter++, 0);
>+    });
>+}, "Microtasks should be executed in queued order.");
>diff --git a/LayoutTests/http/wpt/workers/microtasks.any.worker-expected.txt b/LayoutTests/http/wpt/workers/microtasks.any.worker-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..e889b21d3de1b855cbd83e254064acd7e1ea653c
>--- /dev/null
>+++ b/LayoutTests/http/wpt/workers/microtasks.any.worker-expected.txt
>@@ -0,0 +1,5 @@
>+
>+PASS Microtasks should be executed earlier than macrotasks. 
>+PASS Nested microtasks should be executed earlier than macrotasks. 
>+PASS Microtasks should be executed in queued order. 
>+
>diff --git a/LayoutTests/http/wpt/workers/microtasks.any.worker.html b/LayoutTests/http/wpt/workers/microtasks.any.worker.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2382913528e693b3a5d56c660a45060980b548c3
>--- /dev/null
>+++ b/LayoutTests/http/wpt/workers/microtasks.any.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https-expected.txt
>index b65fc0eba89321bf87618a13bceea1b49f3a6b6c..902a9784d761d9776ffb46212ec56319705adf4e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https-expected.txt
>@@ -1,13 +1,13 @@
> 
> 
> PASS Test calling waitUntil in a different task without an existing extension throws 
>-PASS Test calling waitUntil in a different microtask without an existing extension throws 
>+FAIL Test calling waitUntil in a different microtask without an existing extension throws assert_unreached: unexpected rejection: assert_equals: expected "InvalidStateError" but got "OK" Reached unreachable code
> PASS Test calling waitUntil in a different task with an existing extension succeeds 
> PASS Test calling waitUntil with an existing extension promise handler succeeds 
>-PASS Test calling waitUntil at the end of the microtask turn throws 
>+FAIL Test calling waitUntil at the end of the microtask turn throws assert_unreached: unexpected rejection: assert_equals: expected "InvalidStateError" but got "OK" Reached unreachable code
> PASS Test calling waitUntil after the current extension expired in a different task fails 
> PASS Test calling waitUntil on a script constructed ExtendableEvent throws exception 
> PASS Test calling waitUntil asynchronously with pending respondWith promise. 
> PASS Test calling waitUntil synchronously inside microtask of respondWith promise. 
>-PASS Test calling waitUntil asynchronously inside microtask of respondWith promise. 
>+FAIL Test calling waitUntil asynchronously inside microtask of respondWith promise. assert_unreached: unexpected rejection: assert_equals: expected "InvalidStateError" but got "OK" Reached unreachable code
>

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188246: 346370 | 346371 | 346372 | 346376 | 346377 | 346385 | 346397 | 346400 | 346405 | 346412 | 346415 | 346428 | 346508 | 346517 | 346543 | 346544 | 346548 | 346560 | 346561