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: extensions/renderer/v8_context_native_handler.cc

Issue 1235863003: Don't create cross origins references in the extension system (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "extensions/renderer/v8_context_native_handler.h" 5 #include "extensions/renderer/v8_context_native_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "extensions/common/features/feature.h" 8 #include "extensions/common/features/feature.h"
9 #include "extensions/renderer/dispatcher.h" 9 #include "extensions/renderer/dispatcher.h"
10 #include "extensions/renderer/script_context.h" 10 #include "extensions/renderer/script_context.h"
11 #include "third_party/WebKit/public/web/WebLocalFrame.h"
11 12
12 namespace extensions { 13 namespace extensions {
13 14
14 V8ContextNativeHandler::V8ContextNativeHandler(ScriptContext* context, 15 V8ContextNativeHandler::V8ContextNativeHandler(ScriptContext* context,
15 Dispatcher* dispatcher) 16 Dispatcher* dispatcher)
16 : ObjectBackedNativeHandler(context), 17 : ObjectBackedNativeHandler(context),
17 context_(context), 18 context_(context),
18 dispatcher_(dispatcher) { 19 dispatcher_(dispatcher) {
19 RouteFunction("GetAvailability", 20 RouteFunction("GetAvailability",
20 base::Bind(&V8ContextNativeHandler::GetAvailability, 21 base::Bind(&V8ContextNativeHandler::GetAvailability,
(...skipping 25 matching lines...) Expand all
46 } 47 }
47 48
48 void V8ContextNativeHandler::GetModuleSystem( 49 void V8ContextNativeHandler::GetModuleSystem(
49 const v8::FunctionCallbackInfo<v8::Value>& args) { 50 const v8::FunctionCallbackInfo<v8::Value>& args) {
50 CHECK_EQ(args.Length(), 1); 51 CHECK_EQ(args.Length(), 1);
51 CHECK(args[0]->IsObject()); 52 CHECK(args[0]->IsObject());
52 v8::Local<v8::Context> v8_context = 53 v8::Local<v8::Context> v8_context =
53 v8::Local<v8::Object>::Cast(args[0])->CreationContext(); 54 v8::Local<v8::Object>::Cast(args[0])->CreationContext();
54 ScriptContext* context = 55 ScriptContext* context =
55 dispatcher_->script_context_set().GetByV8Context(v8_context); 56 dispatcher_->script_context_set().GetByV8Context(v8_context);
56 args.GetReturnValue().Set(context->module_system()->NewInstance()); 57 if (blink::WebFrame::scriptCanAccess(context->web_frame()))
not at google - send to devlin 2015/07/13 17:27:08 What is the context for "scriptCanAccess"? Does it
58 args.GetReturnValue().Set(context->module_system()->NewInstance());
57 } 59 }
58 60
59 void V8ContextNativeHandler::RunWithNativesEnabledModuleSystem( 61 void V8ContextNativeHandler::RunWithNativesEnabledModuleSystem(
60 const v8::FunctionCallbackInfo<v8::Value>& args) { 62 const v8::FunctionCallbackInfo<v8::Value>& args) {
61 CHECK_EQ(args.Length(), 1); 63 CHECK_EQ(args.Length(), 1);
62 CHECK(args[0]->IsFunction()); 64 CHECK(args[0]->IsFunction());
63 v8::Local<v8::Value> call_with_args[] = { 65 v8::Local<v8::Value> call_with_args[] = {
64 context()->module_system()->NewInstance()}; 66 context()->module_system()->NewInstance()};
65 ModuleSystem::NativesEnabledScope natives_enabled(context()->module_system()); 67 ModuleSystem::NativesEnabledScope natives_enabled(context()->module_system());
66 context()->CallFunction(v8::Local<v8::Function>::Cast(args[0]), 1, 68 context()->CallFunction(v8::Local<v8::Function>::Cast(args[0]), 1,
67 call_with_args); 69 call_with_args);
68 } 70 }
69 71
70 } // namespace extensions 72 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698