| Index: inspector/front-end/ConsoleView.js
|
| ===================================================================
|
| --- inspector/front-end/ConsoleView.js (revision 53180)
|
| +++ inspector/front-end/ConsoleView.js (working copy)
|
| @@ -292,7 +292,7 @@
|
|
|
| requestClearMessages: function()
|
| {
|
| - InjectedScriptAccess.clearConsoleMessages(function() {});
|
| + InjectedScriptAccess.getDefault().clearConsoleMessages(function() {});
|
| },
|
|
|
| clearMessages: function()
|
| @@ -334,9 +334,14 @@
|
| // Collect comma separated object properties for the completion.
|
|
|
| var includeInspectorCommandLineAPI = (!dotNotation && !bracketNotation);
|
| - if (WebInspector.panels.scripts && WebInspector.panels.scripts.paused)
|
| + var injectedScriptAccess;
|
| + if (WebInspector.panels.scripts && WebInspector.panels.scripts.paused) {
|
| var callFrameId = WebInspector.panels.scripts.selectedCallFrameId();
|
| - InjectedScriptAccess.getCompletions(expressionString, includeInspectorCommandLineAPI, callFrameId, reportCompletions);
|
| + var selectedCallFrame = this.sidebarPanes.callstack.selectedCallFrame;
|
| + injectedScriptAccess = InjectedScriptAccess.get(selectedCallFrame.injectedScriptId);
|
| + } else
|
| + injectedScriptAccess = InjectedScriptAccess.getDefault();
|
| + injectedScriptAccess.get(injectedScriptId).getCompletions(expressionString, includeInspectorCommandLineAPI, callFrameId, reportCompletions);
|
| },
|
|
|
| _reportCompletions: function(bestMatchOnly, completionsReadyCallback, dotNotation, bracketNotation, prefix, result, isException) {
|
| @@ -460,7 +465,7 @@
|
| {
|
| callback(result.value, result.isException);
|
| };
|
| - InjectedScriptAccess.evaluate(expression, objectGroup, evalCallback);
|
| + InjectedScriptAccess.getDefault().evaluate(expression, objectGroup, evalCallback);
|
| },
|
|
|
| _enterKeyPressed: function(event)
|
| @@ -533,12 +538,12 @@
|
| elem.appendChild(treeOutline.element);
|
| }
|
|
|
| - InjectedScriptAccess.pushNodeToFrontend(object, printNode);
|
| + InjectedScriptAccess.get(object.injectedScriptId).pushNodeToFrontend(object, printNode);
|
| },
|
|
|
| _formatarray: function(arr, elem)
|
| {
|
| - InjectedScriptAccess.getProperties(arr, false, false, this._printArray.bind(this, elem));
|
| + InjectedScriptAccess.get(arr.injectedScriptId).getProperties(arr, false, false, this._printArray.bind(this, elem));
|
| },
|
|
|
| _formatstring: function(output, elem)
|
|
|