extensions/renderer/module_system.cc - Issue 234413005: Move most of ChromeV8Context to a base ScriptContext

Unified Diff: extensions/renderer/module_system.cc

Issue 234413005: Move most of ChromeV8Context to a base ScriptContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: New methods have joined ScriptContext; Diablo's minions grow stronger! Created 6 years, 8 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 side-by-side diff with in-line comments

Download patch

Index: extensions/renderer/module_system.cc

diff --git a/chrome/renderer/extensions/module_system.cc b/extensions/renderer/module_system.cc

similarity index 90%

rename from chrome/renderer/extensions/module_system.cc

rename to extensions/renderer/module_system.cc

index b050a9a8129edae812b94da4f8bffbf697b5d766..80d4c0a88bfbcff6c044092c2b49f48ef28bc16a 100644

--- a/chrome/renderer/extensions/module_system.cc

+++ b/extensions/renderer/module_system.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/renderer/extensions/module_system.h"

+#include "extensions/renderer/module_system.h"

#include "base/bind.h"

#include "base/command_line.h"

@@ -10,13 +10,12 @@

#include "base/stl_util.h"

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

-#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/features/feature_channel.h"

-#include "chrome/renderer/extensions/chrome_v8_context.h"

-#include "chrome/renderer/extensions/console.h"

-#include "chrome/renderer/extensions/safe_builtins.h"

#include "content/public/renderer/render_view.h"

#include "extensions/common/extension_messages.h"

+#include "extensions/renderer/console.h"

+#include "extensions/renderer/safe_builtins.h"

+#include "extensions/renderer/script_context.h"

#include "third_party/WebKit/public/web/WebFrame.h"

#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"

@@ -39,7 +38,7 @@ const char* kModulesField = "modules";

// we're at the mercy of the extension or web page's environment. They can mess

// up our JS in unexpected ways. Hopefully dev/canary channel will pick up such

// problems, but given the wider variety on stable/beta it's impossible to know.

-void Fatal(ChromeV8Context* context, const std::string& message) {

+void Fatal(ScriptContext* context, const std::string& message) {

// Prepend some context metadata.

std::string full_message = "(";

if (!context->is_valid())

@@ -67,7 +66,7 @@ void Warn(v8::Isolate* isolate, const std::string& message) {

// Default exception handler which logs the exception.

class DefaultExceptionHandler : public ModuleSystem::ExceptionHandler {

public:

- explicit DefaultExceptionHandler(ChromeV8Context* context)

+ explicit DefaultExceptionHandler(ScriptContext* context)

: context_(context) {}

// Fatally dumps the debug info from |try_catch| to the console.

@@ -87,10 +86,10 @@ class DefaultExceptionHandler : public ModuleSystem::ExceptionHandler {

}

private:

- ChromeV8Context* context_;

+ ScriptContext* context_;

};

-} // namespace

+} // namespace

std::string ModuleSystem::ExceptionHandler::CreateExceptionString(

const v8::TryCatch& try_catch) {

@@ -118,32 +117,30 @@ std::string ModuleSystem::ExceptionHandler::CreateExceptionString(

error_message.c_str());

}

-ModuleSystem::ModuleSystem(ChromeV8Context* context, SourceMap* source_map)

+ModuleSystem::ModuleSystem(ScriptContext* context, SourceMap* source_map)

: ObjectBackedNativeHandler(context),

context_(context),

source_map_(source_map),

natives_enabled_(0),

exception_handler_(new DefaultExceptionHandler(context)) {

- RouteFunction("require",

+ RouteFunction(

+ "require",

base::Bind(&ModuleSystem::RequireForJs, base::Unretained(this)));

- RouteFunction("requireNative",

+ RouteFunction(

+ "requireNative",

base::Bind(&ModuleSystem::RequireNative, base::Unretained(this)));

RouteFunction("privates",

- base::Bind(&ModuleSystem::Private, base::Unretained(this)));

+ base::Bind(&ModuleSystem::Private, base::Unretained(this)));

v8::Handle<v8::Object> global(context->v8_context()->Global());

v8::Isolate* isolate = context->isolate();

- global->SetHiddenValue(

- v8::String::NewFromUtf8(isolate, kModulesField),

- v8::Object::New(isolate));

- global->SetHiddenValue(

- v8::String::NewFromUtf8(isolate, kModuleSystem),

- v8::External::New(isolate, this));

+ global->SetHiddenValue(v8::String::NewFromUtf8(isolate, kModulesField),

+ v8::Object::New(isolate));

+ global->SetHiddenValue(v8::String::NewFromUtf8(isolate, kModuleSystem),

+ v8::External::New(isolate, this));

}

-ModuleSystem::~ModuleSystem() {

- Invalidate();

+ModuleSystem::~ModuleSystem() { Invalidate(); }

void ModuleSystem::Invalidate() {

if (!is_valid())

@@ -162,7 +159,8 @@ void ModuleSystem::Invalidate() {

// Invalidate all of the successfully required handlers we own.

for (NativeHandlerMap::iterator it = native_handler_map_.begin();

- it != native_handler_map_.end(); ++it) {

+ it != native_handler_map_.end();

+ ++it) {

it->second->Invalidate();

}

@@ -191,7 +189,7 @@ v8::Handle<v8::Value> ModuleSystem::Require(const std::string& module_name) {

}

void ModuleSystem::RequireForJs(

- const v8::FunctionCallbackInfo<v8::Value>& args) {

+ const v8::FunctionCallbackInfo<v8::Value>& args) {

v8::Handle<v8::String> module_name = args[0]->ToString();

args.GetReturnValue().Set(RequireForJsInner(module_name));

}

@@ -224,8 +222,8 @@ v8::Local<v8::Value> ModuleSystem::RequireForJsInner(

Fatal(context_, "No source for require(" + module_name_str + ")");

return v8::Undefined(GetIsolate());

}

- v8::Handle<v8::String> wrapped_source(WrapSource(

- v8::Handle<v8::String>::Cast(source)));

+ v8::Handle<v8::String> wrapped_source(

+ WrapSource(v8::Handle<v8::String>::Cast(source)));

// Modules are wrapped in (function(){...}) so they always return functions.

v8::Handle<v8::Value> func_as_value = RunString(wrapped_source, module_name);

if (func_as_value.IsEmpty() || func_as_value->IsUndefined()) {

@@ -292,9 +290,12 @@ v8::Local<v8::Value> ModuleSystem::CallModuleMethod(

const std::string& method_name,

int argc,

v8::Handle<v8::Value> argv[]) {

- TRACE_EVENT2("v8", "v8.callModuleMethod",

- "module_name", module_name,

- "method_name", method_name);

+ TRACE_EVENT2("v8",

+ "v8.callModuleMethod",

+ "module_name",

+ module_name,

+ "method_name",

+ method_name);

v8::EscapableHandleScope handle_scope(GetIsolate());

v8::Context::Scope context_scope(context()->v8_context());

@@ -313,9 +314,8 @@ v8::Local<v8::Value> ModuleSystem::CallModuleMethod(

v8::Local<v8::Primitive>(v8::Undefined(GetIsolate())));

}

- v8::Local<v8::Value> value =

- v8::Handle<v8::Object>::Cast(module)->Get(

- v8::String::NewFromUtf8(GetIsolate(), method_name.c_str()));

+ v8::Local<v8::Value> value = v8::Handle<v8::Object>::Cast(module)->Get(

+ v8::String::NewFromUtf8(GetIsolate(), method_name.c_str()));

if (value.IsEmpty() || !value->IsFunction()) {

Fatal(context_, module_name + "." + method_name + " is not a function");

return handle_scope.Escape(

@@ -334,7 +334,8 @@ v8::Local<v8::Value> ModuleSystem::CallModuleMethod(

return handle_scope.Escape(result);

}

-void ModuleSystem::RegisterNativeHandler(const std::string& name,

+void ModuleSystem::RegisterNativeHandler(

+ const std::string& name,

scoped_ptr<NativeHandler> native_handler) {

native_handler_map_[name] =

linked_ptr<NativeHandler>(native_handler.release());

@@ -354,9 +355,7 @@ void ModuleSystem::RunString(const std::string& code, const std::string& name) {

void ModuleSystem::NativeLazyFieldGetter(

v8::Local<v8::String> property,

const v8::PropertyCallbackInfo<v8::Value>& info) {

- LazyFieldGetterInner(property,

- info,

- &ModuleSystem::RequireNativeFromString);

+ LazyFieldGetterInner(property, info, &ModuleSystem::RequireNativeFromString);

}

// static

@@ -391,8 +390,10 @@ void ModuleSystem::LazyFieldGetterInner(

ModuleSystem* module_system = static_cast<ModuleSystem*>(

v8::Handle<v8::External>::Cast(module_system_value)->Value());

- std::string name = *v8::String::Utf8Value(parameters->Get(

- v8::String::NewFromUtf8(info.GetIsolate(), kModuleName))->ToString());

+ std::string name =

+ *v8::String::Utf8Value(

+ parameters->Get(v8::String::NewFromUtf8(info.GetIsolate(),

+ kModuleName))->ToString());

// Switch to our v8 context because we need functions created while running

// the require()d module to belong to our context, not the current one.

@@ -445,8 +446,8 @@ void ModuleSystem::SetLazyField(v8::Handle<v8::Object> object,

const std::string& field,

const std::string& module_name,

const std::string& module_field) {

- SetLazyField(object, field, module_name, module_field,

- &ModuleSystem::LazyFieldGetter);

+ SetLazyField(

+ object, field, module_name, module_field, &ModuleSystem::LazyFieldGetter);

}

void ModuleSystem::SetLazyField(v8::Handle<v8::Object> object,

@@ -470,11 +471,13 @@ void ModuleSystem::SetNativeLazyField(v8::Handle<v8::Object> object,

const std::string& field,

const std::string& module_name,

const std::string& module_field) {

- SetLazyField(object, field, module_name, module_field,

- &ModuleSystem::NativeLazyFieldGetter);

+ SetLazyField(object,

+ field,

+ module_name,

+ module_field,

+ &ModuleSystem::NativeLazyFieldGetter);

}

v8::Handle<v8::Value> ModuleSystem::RunString(v8::Handle<v8::String> code,

v8::Handle<v8::String> name) {

v8::EscapableHandleScope handle_scope(GetIsolate());

@@ -482,8 +485,8 @@ v8::Handle<v8::Value> ModuleSystem::RunString(v8::Handle<v8::String> code,

// Prepend extensions:: to |name| so that internal code can be differentiated

// from external code in stack traces. This has no effect on behaviour.

- std::string internal_name = base::StringPrintf("extensions::%s",

- *v8::String::Utf8Value(name));

+ std::string internal_name =

+ base::StringPrintf("extensions::%s", *v8::String::Utf8Value(name));

blink::WebScopedMicrotaskSuppression suppression;

v8::TryCatch try_catch;

« no previous file with comments | « extensions/renderer/module_system.h ('k') | extensions/renderer/object_backed_native_handler.h » ('j') | extensions/renderer/script_context.cc » ('J')