DevTools: injected script per context(WebCore part)

inspector/front-end/ConsoleView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 274 matching lines @@
                 WebInspector.warnings += msg.repeatDelta;
                 break;
             case WebInspector.ConsoleMessage.MessageLevel.Error:
                 WebInspector.errors += msg.repeatDelta;
                 break;
         }
     },
 
     requestClearMessages: function()
     {
-        InjectedScriptAccess.clearConsoleMessages(function() {});
+        InjectedScriptAccess.getDefault().clearConsoleMessages(function() {});
     },
 
     clearMessages: function()
     {
         if (WebInspector.panels.resources)
             WebInspector.panels.resources.clearMessages();
 
         this.messages = [];
 
         this.groupLevel = 0;
@@ skipping 21 matching lines @@
             expressionString = expressionString.substr(0, lastIndex);
 
         var prefix = wordRange.toString();
         if (!expressionString && !prefix)
             return;
 
         var reportCompletions = this._reportCompletions.bind(this, bestMatchOnly, completionsReadyCallback, dotNotation, bracketNotation, prefix);
         // 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) {
         if (isException)
             return;
 
         if (bracketNotation) {
             if (prefix.length && prefix[0] === "'")
                 var quoteUsed = "'";
             else
@@ skipping 103 matching lines @@
     {
         if (!expression) {
             // There is no expression, so the completion should happen against global properties.
             expression = "this";
         }
 
         function evalCallback(result)
         {
             callback(result.value, result.isException);
         };
-        InjectedScriptAccess.evaluate(expression, objectGroup, evalCallback);
+        InjectedScriptAccess.getDefault().evaluate(expression, objectGroup, evalCallback);
     },
 
     _enterKeyPressed: function(event)
     {
         if (event.altKey)
             return;
 
         event.preventDefault();
         event.stopPropagation();
 
@@ skipping 52 matching lines @@
                 return;
             var treeOutline = new WebInspector.ElementsTreeOutline();
             treeOutline.showInElementsPanelEnabled = true;
             treeOutline.rootDOMNode = WebInspector.domAgent.nodeForId(nodeId);
             treeOutline.element.addStyleClass("outline-disclosure");
             if (!treeOutline.children[0].hasChildren)
                 treeOutline.element.addStyleClass("single-node");
             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)
     {
         var span = document.createElement("span");
         span.className = "console-formatted-string source-code";
         span.appendChild(WebInspector.linkifyStringAsFragment(output.description));
 
         // Make black quotes.
         elem.removeStyleClass("console-formatted-string");
@@ skipping 461 matching lines @@
                     groupElement.removeStyleClass("collapsed");
                 else
                     groupElement.addStyleClass("collapsed");
             groupTitleElement.scrollIntoViewIfNeeded(true);
         }
 
         event.stopPropagation();
         event.preventDefault();
     }
 }