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

Unified Diff: extensions/renderer/module_system.cc

Issue 482603002: Unify logic of stack trace generation for extension errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add $Error and $String.indexOf to safe builtins Created 6 years, 4 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
« no previous file with comments | « no previous file | extensions/renderer/resources/binding.js » ('j') | extensions/renderer/resources/binding.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/module_system.cc
diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index f9e8d91df590065a82a31cf5725ab0aa320c1049..5938556191ae68976accf72d8f6e60bc23eb40ec 100644
--- a/extensions/renderer/module_system.cc
+++ b/extensions/renderer/module_system.cc
@@ -551,12 +551,8 @@ v8::Handle<v8::String> ModuleSystem::WrapSource(v8::Handle<v8::String> source) {
GetIsolate(),
"(function(define, require, requireNative, requireAsync, exports, "
"console, privates,"
- "$Array, $Function, $JSON, $Object, $RegExp, $String) {"
- "'use strict';"
- // Prevent extensions from overriding the Error constructor.
- // Use window.Error instead of $Error to make sure that extensions can
- // still use "instanceof Error" for exception handling.
- "var Error = window.Error;");
+ "$Array, $Function, $JSON, $Object, $RegExp, $String, $Error) {"
+ "'use strict';");
v8::Handle<v8::String> right = v8::String::NewFromUtf8(GetIsolate(), "\n})");
return handle_scope.Escape(v8::Local<v8::String>(
v8::String::Concat(left, v8::String::Concat(source, right))));
@@ -628,6 +624,7 @@ v8::Handle<v8::Value> ModuleSystem::LoadModule(const std::string& module_name) {
context_->safe_builtins()->GetObjekt(),
context_->safe_builtins()->GetRegExp(),
context_->safe_builtins()->GetString(),
+ context_->safe_builtins()->GetError(),
};
{
v8::TryCatch try_catch;
« no previous file with comments | « no previous file | extensions/renderer/resources/binding.js » ('j') | extensions/renderer/resources/binding.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698