Chromium Code Reviews| 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..ef8792b9759a1cd13783528b671e69777f7ad50b 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/sdk/InspectorBackendHostedMode.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/sdk/InspectorBackendHostedMode.js |
| @@ -6,21 +6,17 @@ |
| WebInspector.InspectorBackendHostedMode = {}; |
| -/** |
| - * @param {string} jsonUrl |
| - */ |
| -WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded = function(jsonUrl) |
| +WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded = function() |
| { |
| if (InspectorBackend.isInitialized()) |
| return; |
| - var xhr = new XMLHttpRequest(); |
| - xhr.open("GET", jsonUrl, false); |
| - xhr.send(null); |
| - |
| - var schema = JSON.parse(xhr.responseText); |
| - var code = WebInspector.InspectorBackendHostedMode.generateCommands(schema); |
| - eval(code); |
| + var protocolURLs = Object.keys(Runtime.cachedResources).filter(url => url.indexOf("protocol.json") !== -1); |
|
dgozman
2016/07/08 05:45:07
This code will be much easier without fancy functi
lushnikov
2016/07/08 17:09:53
Done.
|
| + var protocols = protocolURLs.map(url => Runtime.cachedResources[url]); |
| + for (var protocol of protocols) { |
| + var code = WebInspector.InspectorBackendHostedMode.generateCommands(JSON.parse(protocol)); |
| + eval(code); |
| + } |
| } |
| /** |
| @@ -122,4 +118,4 @@ WebInspector.InspectorBackendHostedMode.generateCommands = function(schema) |
| return result.join("\n"); |
| } |
| -WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded("../inspector.json"); |
| +WebInspector.InspectorBackendHostedMode.loadFromJSONIfNeeded(); |