| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "bindings/v8/ScriptState.h" | 6 #include "bindings/v8/ScriptState.h" |
| 7 | 7 |
| 8 #include "bindings/v8/V8Binding.h" | 8 #include "bindings/v8/V8Binding.h" |
| 9 #include "core/dom/ExecutionContext.h" | 9 #include "core/dom/ExecutionContext.h" |
| 10 #include "core/frame/LocalFrame.h" | 10 #include "core/frame/LocalFrame.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 { | 67 { |
| 68 v8::HandleScope scope(m_isolate); | 68 v8::HandleScope scope(m_isolate); |
| 69 return toExecutionContext(context()); | 69 return toExecutionContext(context()); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void ScriptState::setExecutionContext(ExecutionContext*) | 72 void ScriptState::setExecutionContext(ExecutionContext*) |
| 73 { | 73 { |
| 74 ASSERT_NOT_REACHED(); | 74 ASSERT_NOT_REACHED(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 DOMWindow* ScriptState::domWindow() const | 77 LocalDOMWindow* ScriptState::domWindow() const |
| 78 { | 78 { |
| 79 v8::HandleScope scope(m_isolate); | 79 v8::HandleScope scope(m_isolate); |
| 80 return toDOMWindow(context()); | 80 return toDOMWindow(context()); |
| 81 } | 81 } |
| 82 | 82 |
| 83 ScriptState* ScriptState::forMainWorld(LocalFrame* frame) | 83 ScriptState* ScriptState::forMainWorld(LocalFrame* frame) |
| 84 { | 84 { |
| 85 v8::Isolate* isolate = toIsolate(frame); | 85 v8::Isolate* isolate = toIsolate(frame); |
| 86 v8::HandleScope handleScope(isolate); | 86 v8::HandleScope handleScope(isolate); |
| 87 return ScriptState::from(toV8Context(frame, DOMWrapperWorld::mainWorld())); | 87 return ScriptState::from(toV8Context(frame, DOMWrapperWorld::mainWorld())); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 105 { | 105 { |
| 106 return m_executionContext; | 106 return m_executionContext; |
| 107 } | 107 } |
| 108 | 108 |
| 109 void ScriptStateForTesting::setExecutionContext(ExecutionContext* executionConte
xt) | 109 void ScriptStateForTesting::setExecutionContext(ExecutionContext* executionConte
xt) |
| 110 { | 110 { |
| 111 m_executionContext = executionContext; | 111 m_executionContext = executionContext; |
| 112 } | 112 } |
| 113 | 113 |
| 114 } | 114 } |
| OLD | NEW |