summaryrefslogtreecommitdiff
path: root/Source/WebCore/bindings/js/ScriptState.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/bindings/js/ScriptState.h')
-rw-r--r--Source/WebCore/bindings/js/ScriptState.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/Source/WebCore/bindings/js/ScriptState.h b/Source/WebCore/bindings/js/ScriptState.h
index 70d14c7cd..74421fd95 100644
--- a/Source/WebCore/bindings/js/ScriptState.h
+++ b/Source/WebCore/bindings/js/ScriptState.h
@@ -29,14 +29,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ScriptState_h
-#define ScriptState_h
+#pragma once
namespace JSC {
class ExecState;
}
namespace WebCore {
+
class DOMWindow;
class DOMWrapperWorld;
class Frame;
@@ -45,21 +45,14 @@ class Page;
class ScriptExecutionContext;
class WorkerGlobalScope;
-// The idea is to expose "state-like" methods (hadException, and any other
-// methods where ExecState just dips into vm) of JSC::ExecState as a
-// separate abstraction.
-// For now, the separation is purely by convention.
-typedef JSC::ExecState ScriptState;
-
DOMWindow* domWindowFromExecState(JSC::ExecState*);
+Frame* frameFromExecState(JSC::ExecState*);
ScriptExecutionContext* scriptExecutionContextFromExecState(JSC::ExecState*);
JSC::ExecState* mainWorldExecState(Frame*);
JSC::ExecState* execStateFromNode(DOMWrapperWorld&, Node*);
-JSC::ExecState* execStateFromPage(DOMWrapperWorld&, Page*);
+WEBCORE_EXPORT JSC::ExecState* execStateFromPage(DOMWrapperWorld&, Page*);
JSC::ExecState* execStateFromWorkerGlobalScope(WorkerGlobalScope*);
} // namespace WebCore
-
-#endif // ScriptState_h