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..3e777adf765c9a09004f7bebc3d3f27f06c28263 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,28 @@ |
WebInspector.InspectorBackendHostedMode = {}; |
/** |
- * @param {string} jsonUrl |
+ * @param {!Array<string>} urls |
+ * @return {?Promise} |
*/ |
-WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded = function(jsonUrl) |
+WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded = function(urls) |
{ |
if (InspectorBackend.isInitialized()) |
- return; |
+ return null; |
- var xhr = new XMLHttpRequest(); |
- xhr.open("GET", jsonUrl, false); |
- xhr.send(null); |
+ var promises = urls.map(url => loadURL(url)); |
+ return Promise.all(promises); |
- var schema = JSON.parse(xhr.responseText); |
- var code = WebInspector.InspectorBackendHostedMode.generateCommands(schema); |
- eval(code); |
+ /** |
+ * @param {string} url |
+ * @return {!Promise} |
+ */ |
+ function loadURL(url) |
+ { |
+ return fetch(url) |
+ .then(response => response.text()) |
pfeldman
2016/07/07 23:25:44
I consider this an anti-pattern. Sync code should
|
+ .then(schema => WebInspector.InspectorBackendHostedMode.generateCommands(JSON.parse(schema))) |
+ .then(code => eval(code)); |
+ } |
} |
/** |
@@ -122,4 +130,7 @@ WebInspector.InspectorBackendHostedMode.generateCommands = function(schema) |
return result.join("\n"); |
} |
-WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded("../inspector.json"); |
+WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded([ |
+ "../sdk/protocol/browser_protocol.json", |
+ "../sdk/protocol/js_protocol.json" |
+]); |