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

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/InspectorBackendHostedMode.js

Issue 2124203002: DevTools: copy protocol files to front-end to fix hosted mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/sdk/InspectorBackendHostedMode.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/InspectorBackendHostedMode.js b/third_party/WebKit/Source/devtools/front_end/sdk/InspectorBackendHostedMode.js
index 7c98b7348ba7951ccde235f110d096e6512057b9..c77508319057fda7b202a79e6e658f2fa4f603a2 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/InspectorBackendHostedMode.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/InspectorBackendHostedMode.js
@@ -7,20 +7,23 @@
WebInspector.InspectorBackendHostedMode = {};
/**
- * @param {string} jsonUrl
+ * @param {!Array<string>} urls
*/
-WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded = function(jsonUrl)
+WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded = function(urls)
{
if (InspectorBackend.isInitialized())
return;
- var xhr = new XMLHttpRequest();
- xhr.open("GET", jsonUrl, false);
- xhr.send(null);
+ var promises = urls.map(url => loadURL(url));
+ self.runtime.onAsyncEvalCompletion = Promise.all(promises);
pfeldman 2016/07/07 04:13:34 return Promise.all(promises);
dgozman 2016/07/07 19:39:24 Can we fetch the json even before calling Runtime.
lushnikov 2016/07/07 21:26:22 Done.
- var schema = JSON.parse(xhr.responseText);
- var code = WebInspector.InspectorBackendHostedMode.generateCommands(schema);
- eval(code);
+ function loadURL(url)
pfeldman 2016/07/07 04:13:34 Annotate the url.
lushnikov 2016/07/07 21:26:22 Done.
+ {
+ return fetch(url)
+ .then(response => response.text())
pfeldman 2016/07/07 04:13:34 response => eval(WebInspector.InspectorBackendHost
lushnikov 2016/07/07 21:26:22 response.text() is a promise I'd like to leave th
+ .then(schema => WebInspector.InspectorBackendHostedMode.generateCommands(schema))
+ .then(code => eval(code));
+ }
}
/**
@@ -122,4 +125,7 @@ WebInspector.InspectorBackendHostedMode.generateCommands = function(schema)
return result.join("\n");
}
-WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded("../inspector.json");
+WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded([
+ "../protocol/browser_protocol.json",
+ "../protocol/js_protocol.json"
+]);

Powered by Google App Engine
This is Rietveld 408576698