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

Unified Diff: Source/devtools/front_end/Runtime.js

Issue 573453004: DevTools: Get rid of frontend_modules.json (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/Runtime.js
diff --git a/Source/devtools/front_end/Runtime.js b/Source/devtools/front_end/Runtime.js
index 9f0e5b6f2c5e3715b4b544b5664464a0d98039d6..31fbfb1223e582990a6276c68aace5ffd2a67142 100644
--- a/Source/devtools/front_end/Runtime.js
+++ b/Source/devtools/front_end/Runtime.js
@@ -217,6 +217,8 @@ Runtime.startWorker = function(moduleName)
}
}
+Runtime._coreModules = ["common", "host", "sdk", "ui", "components", "workspace", "bindings", "screencast", "toolbox", "main"];
pfeldman 2014/09/19 11:35:35 Lets feed them to runtime as we do with configurat
apavlov 2014/09/19 13:09:40 Done.
+
Runtime.prototype = {
/**
* @param {!Array.<string>} configuration
@@ -233,9 +235,17 @@ Runtime.prototype = {
_registerModule: function(moduleName)
{
if (!this._descriptorsMap[moduleName]) {
- var content = loadResource(moduleName + "/module.json");
+ var content;
+ // FIXME: This is a temp workaround to avoid core module loading attempts in the release mode.
+ // It should be removed when the new application loader is implemented.
+ if (Runtime._coreModules.indexOf(moduleName) === -1)
+ content = loadResource(moduleName + "/module.json");
+ else
+ content = "{}";
+
if (!content)
throw new Error("Module is not defined: " + moduleName + " " + new Error().stack);
+
var module = /** @type {!Runtime.ModuleDescriptor} */ (self.eval("(" + content + ")"));
module["name"] = moduleName;
this._descriptorsMap[moduleName] = module;
@@ -537,7 +547,10 @@ Runtime.Module.prototype = {
this._manager.loadModule(dependencies[i]);
if (this._descriptor.scripts) {
if (Runtime.isReleaseMode()) {
- loadScript(this._name + ".js");
+ // FIXME: This is a temp workaround to avoid core module loading attempts in the release mode.
+ // It should be removed when the new application loader is implemented.
+ if (Runtime._coreModules.indexOf(this._name) === -1)
+ loadScript(this._name + ".js");
} else {
var scripts = this._descriptor.scripts;
for (var i = 0; i < scripts.length; ++i)

Powered by Google App Engine
This is Rietveld 408576698