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

Side by Side Diff: Source/bindings/v8/custom/V8InjectedScriptManager.cpp

Issue 23799009: Always pass v8::Isolate to v8::Number::New() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // Inject javascript into the context. The compiled script is supposed to ev aluate into 85 // Inject javascript into the context. The compiled script is supposed to ev aluate into
86 // a single anonymous function(it's anonymous to avoid cluttering the global object with 86 // a single anonymous function(it's anonymous to avoid cluttering the global object with
87 // inspector's stuff) the function is called a few lines below with Injected ScriptHost wrapper, 87 // inspector's stuff) the function is called a few lines below with Injected ScriptHost wrapper,
88 // injected script id and explicit reference to the inspected global object. The function is expected 88 // injected script id and explicit reference to the inspected global object. The function is expected
89 // to create and configure InjectedScript instance that is going to be used by the inspector. 89 // to create and configure InjectedScript instance that is going to be used by the inspector.
90 v8::Local<v8::Value> value = V8ScriptRunner::compileAndRunInternalScript(v8S tring(scriptSource, isolate), isolate); 90 v8::Local<v8::Value> value = V8ScriptRunner::compileAndRunInternalScript(v8S tring(scriptSource, isolate), isolate);
91 ASSERT(!value.IsEmpty()); 91 ASSERT(!value.IsEmpty());
92 ASSERT(value->IsFunction()); 92 ASSERT(value->IsFunction());
93 93
94 v8::Local<v8::Object> windowGlobal = inspectedContext->Global(); 94 v8::Local<v8::Object> windowGlobal = inspectedContext->Global();
95 v8::Handle<v8::Value> args[] = { scriptHostWrapper, windowGlobal, v8::Number ::New(id) }; 95 v8::Handle<v8::Value> args[] = { scriptHostWrapper, windowGlobal, v8::Number ::New(inspectedContext->GetIsolate(), id) };
96 v8::Local<v8::Value> injectedScriptValue = V8ScriptRunner::callInternalFunct ion(v8::Local<v8::Function>::Cast(value), windowGlobal, WTF_ARRAY_LENGTH(args), args, inspectedContext->GetIsolate()); 96 v8::Local<v8::Value> injectedScriptValue = V8ScriptRunner::callInternalFunct ion(v8::Local<v8::Function>::Cast(value), windowGlobal, WTF_ARRAY_LENGTH(args), args, inspectedContext->GetIsolate());
97 return ScriptObject(inspectedScriptState, v8::Handle<v8::Object>::Cast(injec tedScriptValue)); 97 return ScriptObject(inspectedScriptState, v8::Handle<v8::Object>::Cast(injec tedScriptValue));
98 } 98 }
99 99
100 bool InjectedScriptManager::canAccessInspectedWindow(ScriptState* scriptState) 100 bool InjectedScriptManager::canAccessInspectedWindow(ScriptState* scriptState)
101 { 101 {
102 v8::HandleScope handleScope(scriptState->isolate()); 102 v8::HandleScope handleScope(scriptState->isolate());
103 v8::Local<v8::Context> context = scriptState->context(); 103 v8::Local<v8::Context> context = scriptState->context();
104 v8::Local<v8::Object> global = context->Global(); 104 v8::Local<v8::Object> global = context->Global();
105 if (global.IsEmpty()) 105 if (global.IsEmpty())
106 return false; 106 return false;
107 v8::Handle<v8::Object> holder = global->FindInstanceInPrototypeChain(V8Windo w::GetTemplate(context->GetIsolate(), MainWorld)); 107 v8::Handle<v8::Object> holder = global->FindInstanceInPrototypeChain(V8Windo w::GetTemplate(context->GetIsolate(), MainWorld));
108 if (holder.IsEmpty()) 108 if (holder.IsEmpty())
109 holder = global->FindInstanceInPrototypeChain(V8Window::GetTemplate(cont ext->GetIsolate(), IsolatedWorld)); 109 holder = global->FindInstanceInPrototypeChain(V8Window::GetTemplate(cont ext->GetIsolate(), IsolatedWorld));
110 if (holder.IsEmpty()) 110 if (holder.IsEmpty())
111 return false; 111 return false;
112 Frame* frame = V8Window::toNative(holder)->frame(); 112 Frame* frame = V8Window::toNative(holder)->frame();
113 113
114 v8::Context::Scope contextScope(context); 114 v8::Context::Scope contextScope(context);
115 return BindingSecurity::shouldAllowAccessToFrame(frame, DoNotReportSecurityE rror); 115 return BindingSecurity::shouldAllowAccessToFrame(frame, DoNotReportSecurityE rror);
116 } 116 }
117 117
118 void InjectedScriptManager::makeWeakCallback(v8::Isolate* isolate, v8::Persisten t<v8::Object>* object, InjectedScriptHost* host) 118 void InjectedScriptManager::makeWeakCallback(v8::Isolate* isolate, v8::Persisten t<v8::Object>* object, InjectedScriptHost* host)
119 { 119 {
120 host->deref(); 120 host->deref();
121 object->Dispose(); 121 object->Dispose();
122 } 122 }
123 123
124 } // namespace WebCore 124 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp ('k') | Source/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698