commit 1ed2e89d509352d44adf85de7498fba116872fdd
author rdevlin.cronin <rdevlin.cronin@chromium.org> Tue Dec 06 21:35:43 2016
committer Commit bot <commit-bot@chromium.org> Tue Dec 06 21:39:00 2016
tree 75392db9c5a0817d48d0c4c17c6a9022f3f058f2
parent add906ecd953bbcddb9e1da70f1302df87496470

[Extensions] Pull ModuleSystem::SourceMap into its own file

ModuleSystem::SourceMap contains a mapping from resource names to
resources, and is used for getting strings for our custom bindings.
It's a structure that will be useful in our C++ bindings, and its
already a little weird to have it be declared in the context of the
module system, so pull it out into its own file.

Also simplify the SourceMap object slightly to return a v8::String
directly and remove the helper method in ModuleSystem.

BUG=None

Review-Url: https://codereview.chromium.org/2560503003
Cr-Commit-Position: refs/heads/master@{#436738}

extensions/renderer/module_system.cc

diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index a8e3bdb..034291c 100644
--- a/extensions/renderer/module_system.cc
+++ b/extensions/renderer/module_system.cc
@@ -21,6 +21,7 @@
 #include "extensions/renderer/safe_builtins.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_context_set.h"
+#include "extensions/renderer/source_map.h"
 #include "extensions/renderer/v8_helpers.h"
 #include "gin/modules/module_registry.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
@@ -545,14 +546,6 @@
                              base::Unretained(exception_handler_.get())));
 }
 
-v8::Local<v8::Value> ModuleSystem::GetSource(const std::string& module_name) {
-  v8::EscapableHandleScope handle_scope(GetIsolate());
-  if (!source_map_->Contains(module_name))
-    return v8::Undefined(GetIsolate());
-  return handle_scope.Escape(
-      v8::Local<v8::Value>(source_map_->GetSource(GetIsolate(), module_name)));
-}
-
 void ModuleSystem::RequireNative(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   CHECK_EQ(1, args.Length());
@@ -668,13 +661,13 @@
   v8::Local<v8::Context> v8_context = context()->v8_context();
   v8::Context::Scope context_scope(v8_context);
 
-  v8::Local<v8::Value> source(GetSource(module_name));
-  if (source.IsEmpty() || source->IsUndefined()) {
+  v8::Local<v8::String> source =
+      source_map_->GetSource(GetIsolate(), module_name);
+  if (source.IsEmpty()) {
     Fatal(context_, "No source for require(" + module_name + ")");
     return v8::Undefined(GetIsolate());
   }
-  v8::Local<v8::String> wrapped_source(
-      WrapSource(v8::Local<v8::String>::Cast(source)));
+  v8::Local<v8::String> wrapped_source(WrapSource(source));
   v8::Local<v8::String> v8_module_name;
   if (!ToV8String(GetIsolate(), module_name.c_str(), &v8_module_name)) {
     NOTREACHED() << "module_name is too long";