Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp

Issue 2721693002: Revert of Switch RemoteWindowProxy to use v8::Context::NewRemoteContext. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include "core/frame/LocalDOMWindow.h" 9 #include "core/frame/LocalDOMWindow.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 18 matching lines...) Expand all
29 const v8::WeakCallbackInfo<ScriptState>& data) { 29 const v8::WeakCallbackInfo<ScriptState>& data) {
30 data.GetParameter()->clearContext(); 30 data.GetParameter()->clearContext();
31 data.SetSecondPassCallback(derefCallback); 31 data.SetSecondPassCallback(derefCallback);
32 } 32 }
33 33
34 ScriptState::ScriptState(v8::Local<v8::Context> context, 34 ScriptState::ScriptState(v8::Local<v8::Context> context,
35 PassRefPtr<DOMWrapperWorld> world) 35 PassRefPtr<DOMWrapperWorld> world)
36 : m_isolate(context->GetIsolate()), 36 : m_isolate(context->GetIsolate()),
37 m_context(m_isolate, context), 37 m_context(m_isolate, context),
38 m_world(world), 38 m_world(world),
39 m_perContextData(V8PerContextData::create(context)) { 39 m_perContextData(V8PerContextData::create(context))
40 {
40 DCHECK(m_world); 41 DCHECK(m_world);
41 m_context.setWeak(this, &contextCollectedCallback); 42 m_context.setWeak(this, &contextCollectedCallback);
42 context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this); 43 context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this);
43 } 44 }
44 45
45 ScriptState::~ScriptState() { 46 ScriptState::~ScriptState() {
46 ASSERT(!m_perContextData); 47 ASSERT(!m_perContextData);
47 ASSERT(m_context.isEmpty()); 48 ASSERT(m_context.isEmpty());
48 } 49 }
49 50
50 void ScriptState::detachGlobalObject() { 51 void ScriptState::detachGlobalObject() {
51 ASSERT(!m_context.isEmpty()); 52 ASSERT(!m_context.isEmpty());
52 context()->DetachGlobal(); 53 context()->DetachGlobal();
54 #if DCHECK_IS_ON()
55 m_globalObjectDetached = true;
56 #endif
53 } 57 }
54 58
55 void ScriptState::disposePerContextData() { 59 void ScriptState::disposePerContextData() {
56 m_perContextData = nullptr; 60 m_perContextData = nullptr;
57 } 61 }
58 62
59 ScriptValue ScriptState::getFromExtrasExports(const char* name) { 63 ScriptValue ScriptState::getFromExtrasExports(const char* name) {
60 v8::HandleScope handleScope(m_isolate); 64 v8::HandleScope handleScope(m_isolate);
61 v8::Local<v8::Value> v8Value; 65 v8::Local<v8::Value> v8Value;
62 if (!context() 66 if (!context()
(...skipping 27 matching lines...) Expand all
90 v8::HandleScope handleScope(toIsolate(frame)); 94 v8::HandleScope handleScope(toIsolate(frame));
91 v8::Local<v8::Context> context = toV8Context(frame, world); 95 v8::Local<v8::Context> context = toV8Context(frame, world);
92 if (context.IsEmpty()) 96 if (context.IsEmpty())
93 return nullptr; 97 return nullptr;
94 ScriptState* scriptState = ScriptState::from(context); 98 ScriptState* scriptState = ScriptState::from(context);
95 ASSERT(scriptState->contextIsValid()); 99 ASSERT(scriptState->contextIsValid());
96 return scriptState; 100 return scriptState;
97 } 101 }
98 102
99 } // namespace blink 103 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/ScriptState.h ('k') | third_party/WebKit/Source/bindings/core/v8/V8Binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698