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

Side by Side Diff: Source/bindings/v8/ScriptState.cpp

Issue 135843008: Remove V8HiddenPropertyName (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/ScriptController.cpp ('k') | Source/bindings/v8/V8AbstractEventListener.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 16 matching lines...) Expand all
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 "V8WorkerGlobalScope.h" 35 #include "V8WorkerGlobalScope.h"
36 #include "bindings/v8/ScriptController.h" 36 #include "bindings/v8/ScriptController.h"
37 #include "bindings/v8/V8HiddenPropertyName.h"
38 #include "bindings/v8/WorkerScriptController.h" 37 #include "bindings/v8/WorkerScriptController.h"
39 #include "core/frame/Frame.h" 38 #include "core/frame/Frame.h"
40 #include "core/workers/WorkerGlobalScope.h" 39 #include "core/workers/WorkerGlobalScope.h"
41 #include <v8.h> 40 #include <v8.h>
42 #include "wtf/Assertions.h" 41 #include "wtf/Assertions.h"
43 42
44 namespace WebCore { 43 namespace WebCore {
45 44
46 ScriptState::ScriptState(v8::Handle<v8::Context> context) 45 ScriptState::ScriptState(v8::Handle<v8::Context> context)
47 : m_context(context->GetIsolate(), context) 46 : m_context(context->GetIsolate(), context)
(...skipping 17 matching lines...) Expand all
65 v8::HandleScope handleScope(m_isolate); 64 v8::HandleScope handleScope(m_isolate);
66 return toExecutionContext(m_context.newLocal(m_isolate)); 65 return toExecutionContext(m_context.newLocal(m_isolate));
67 } 66 }
68 67
69 ScriptState* ScriptState::forContext(v8::Handle<v8::Context> context) 68 ScriptState* ScriptState::forContext(v8::Handle<v8::Context> context)
70 { 69 {
71 v8::Context::Scope contextScope(context); 70 v8::Context::Scope contextScope(context);
72 71
73 v8::Local<v8::Object> innerGlobal = v8::Local<v8::Object>::Cast(context->Glo bal()->GetPrototype()); 72 v8::Local<v8::Object> innerGlobal = v8::Local<v8::Object>::Cast(context->Glo bal()->GetPrototype());
74 73
75 v8::Local<v8::Value> scriptStateWrapper = innerGlobal->GetHiddenValue(V8Hidd enPropertyName::scriptState(context->GetIsolate())); 74 v8::Local<v8::Value> scriptStateWrapper = getHiddenValue(context->GetIsolate (), innerGlobal, "scriptState");
76 if (!scriptStateWrapper.IsEmpty() && scriptStateWrapper->IsExternal()) 75 if (!scriptStateWrapper.IsEmpty() && scriptStateWrapper->IsExternal())
77 return static_cast<ScriptState*>(v8::External::Cast(*scriptStateWrapper) ->Value()); 76 return static_cast<ScriptState*>(v8::External::Cast(*scriptStateWrapper) ->Value());
78 77
79 ScriptState* scriptState = new ScriptState(context); 78 ScriptState* scriptState = new ScriptState(context);
80 innerGlobal->SetHiddenValue(V8HiddenPropertyName::scriptState(context->GetIs olate()), v8::External::New(context->GetIsolate(), scriptState)); 79 setHiddenValue(context->GetIsolate(), innerGlobal, "scriptState", v8::Extern al::New(context->GetIsolate(), scriptState));
81 return scriptState; 80 return scriptState;
82 } 81 }
83 82
84 ScriptState* ScriptState::current() 83 ScriptState* ScriptState::current()
85 { 84 {
86 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 85 v8::Isolate* isolate = v8::Isolate::GetCurrent();
87 v8::HandleScope handleScope(isolate); 86 v8::HandleScope handleScope(isolate);
88 v8::Local<v8::Context> context = isolate->GetCurrentContext(); 87 v8::Local<v8::Context> context = isolate->GetCurrentContext();
89 ASSERT(!context.IsEmpty()); 88 ASSERT(!context.IsEmpty());
90 return ScriptState::forContext(context); 89 return ScriptState::forContext(context);
(...skipping 26 matching lines...) Expand all
117 { 116 {
118 WorkerScriptController* script = workerGlobalScope->script(); 117 WorkerScriptController* script = workerGlobalScope->script();
119 if (!script) 118 if (!script)
120 return 0; 119 return 0;
121 120
122 v8::HandleScope handleScope(script->isolate()); 121 v8::HandleScope handleScope(script->isolate());
123 return ScriptState::forContext(script->context()); 122 return ScriptState::forContext(script->context());
124 } 123 }
125 124
126 } 125 }
OLDNEW
« no previous file with comments | « Source/bindings/v8/ScriptController.cpp ('k') | Source/bindings/v8/V8AbstractEventListener.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698