diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-10 15:31:59 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:35:59 -0800 |
| commit | 28040489d744e0c5d475a88663056c9040ed5320 (patch) | |
| tree | c463676791e4a63e452a95f0a12b2a8519730693 /WebCore/bindings/js/ScriptState.cpp | |
| parent | eff9be92c41913c92fb1d3b7983c071f3e718678 (diff) | |
| download | external_webkit-28040489d744e0c5d475a88663056c9040ed5320.zip external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.gz external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.bz2 | |
Merge WebKit at r71558: Initial merge by git.
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
Diffstat (limited to 'WebCore/bindings/js/ScriptState.cpp')
| -rw-r--r-- | WebCore/bindings/js/ScriptState.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/WebCore/bindings/js/ScriptState.cpp b/WebCore/bindings/js/ScriptState.cpp index 3edd1bd..d6699f6 100644 --- a/WebCore/bindings/js/ScriptState.cpp +++ b/WebCore/bindings/js/ScriptState.cpp @@ -35,9 +35,28 @@ #include "JSDOMWindowBase.h" #include "Node.h" #include "Page.h" +#include <interpreter/CallFrame.h> +#include <runtime/JSGlobalObject.h> namespace WebCore { +ScriptStateProtectedPtr::~ScriptStateProtectedPtr() +{ +} + +ScriptStateProtectedPtr::ScriptStateProtectedPtr(ScriptState* scriptState) + : m_globalObject(scriptState->lexicalGlobalObject()) +{ +} + +ScriptState* ScriptStateProtectedPtr::get() const +{ + if (m_globalObject) + return m_globalObject->globalExec(); + return 0; +} + + ScriptState* mainWorldScriptState(Frame* frame) { JSDOMWindowShell* shell = frame->script()->windowShell(mainThreadNormalWorld()); |