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 "bindings/core/v8/ScriptState.h" | 5 #include "bindings/core/v8/ScriptState.h" |
6 | 6 |
7 #include "bindings/core/v8/V8Binding.h" | 7 #include "bindings/core/v8/V8Binding.h" |
8 #include "core/dom/ExecutionContext.h" | 8 #include "core/dom/ExecutionContext.h" |
9 | 9 |
10 namespace blink { | 10 namespace blink { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 v8::Local<v8::Value> v8_value; | 59 v8::Local<v8::Value> v8_value; |
60 if (!GetContext() | 60 if (!GetContext() |
61 ->GetExtrasBindingObject() | 61 ->GetExtrasBindingObject() |
62 ->Get(GetContext(), V8AtomicString(GetIsolate(), name)) | 62 ->Get(GetContext(), V8AtomicString(GetIsolate(), name)) |
63 .ToLocal(&v8_value)) | 63 .ToLocal(&v8_value)) |
64 return ScriptValue(); | 64 return ScriptValue(); |
65 return ScriptValue(this, v8_value); | 65 return ScriptValue(this, v8_value); |
66 } | 66 } |
67 | 67 |
68 ExecutionContext* ScriptState::GetExecutionContext() const { | 68 ExecutionContext* ScriptState::GetExecutionContext() const { |
69 v8::HandleScope scope(isolate_); | 69 return ExecutionContext::From(this); |
70 return ToExecutionContext(GetContext()); | |
71 } | 70 } |
72 | 71 |
73 } // namespace blink | 72 } // namespace blink |
OLD | NEW |