| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "bindings/v8/ScriptState.h" | 32 #include "bindings/v8/ScriptState.h" |
| 33 | 33 |
| 34 #include "V8Window.h" | 34 #include "V8Window.h" |
| 35 #include "V8WorkerContext.h" | 35 #include "V8WorkerGlobalScope.h" |
| 36 #include "bindings/v8/ScriptController.h" | 36 #include "bindings/v8/ScriptController.h" |
| 37 #include "bindings/v8/V8HiddenPropertyName.h" | 37 #include "bindings/v8/V8HiddenPropertyName.h" |
| 38 #include "bindings/v8/WorkerScriptController.h" | 38 #include "bindings/v8/WorkerScriptController.h" |
| 39 #include "core/page/Frame.h" | 39 #include "core/page/Frame.h" |
| 40 #include "core/workers/WorkerContext.h" | 40 #include "core/workers/WorkerGlobalScope.h" |
| 41 #include <v8.h> | 41 #include <v8.h> |
| 42 #include "wtf/Assertions.h" | 42 #include "wtf/Assertions.h" |
| 43 | 43 |
| 44 namespace WebCore { | 44 namespace WebCore { |
| 45 | 45 |
| 46 ScriptState::ScriptState(v8::Handle<v8::Context> context) | 46 ScriptState::ScriptState(v8::Handle<v8::Context> context) |
| 47 : m_context(context) | 47 : m_context(context) |
| 48 , m_isolate(context->GetIsolate()) | 48 , m_isolate(context->GetIsolate()) |
| 49 { | 49 { |
| 50 m_context.makeWeak(this, &makeWeakCallback); | 50 m_context.makeWeak(this, &makeWeakCallback); |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 v8::HandleScope handleScope; | 105 v8::HandleScope handleScope; |
| 106 return context()->AllowCodeGenerationFromStrings(enabled); | 106 return context()->AllowCodeGenerationFromStrings(enabled); |
| 107 } | 107 } |
| 108 | 108 |
| 109 ScriptState* mainWorldScriptState(Frame* frame) | 109 ScriptState* mainWorldScriptState(Frame* frame) |
| 110 { | 110 { |
| 111 v8::HandleScope handleScope; | 111 v8::HandleScope handleScope; |
| 112 return ScriptState::forContext(frame->script()->mainWorldContext()); | 112 return ScriptState::forContext(frame->script()->mainWorldContext()); |
| 113 } | 113 } |
| 114 | 114 |
| 115 ScriptState* scriptStateFromWorkerContext(WorkerContext* workerContext) | 115 ScriptState* scriptStateFromWorkerGlobalScope(WorkerGlobalScope* workerGlobalSco
pe) |
| 116 { | 116 { |
| 117 WorkerScriptController* script = workerContext->script(); | 117 WorkerScriptController* script = workerGlobalScope->script(); |
| 118 if (!script) | 118 if (!script) |
| 119 return 0; | 119 return 0; |
| 120 | 120 |
| 121 v8::HandleScope handleScope; | 121 v8::HandleScope handleScope; |
| 122 return ScriptState::forContext(script->context()); | 122 return ScriptState::forContext(script->context()); |
| 123 } | 123 } |
| 124 | 124 |
| 125 } | 125 } |
| OLD | NEW |