DevTools: injected script per context(WebCore part)

inspector/front-end/inspector.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * 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
@@ skipping 371 matching lines @@
             this.showingDOMNodeHighlight = true;
         } else {
             InspectorBackend.hideDOMNodeHighlight();
             this.showingDOMNodeHighlight = false;
         }
     }
 }
 
 WebInspector.loaded = function()
 {
+    InspectorBackend.setInjectedScriptSource("(" + injectedScriptConstructor + ");");
+
     var platform = WebInspector.platform;
     document.body.addStyleClass("platform-" + platform);
     var port = WebInspector.port;
     document.body.addStyleClass("port-" + port);
 
     this.settings = new WebInspector.Settings();
 
     this.drawer = new WebInspector.Drawer();
     this.console = new WebInspector.ConsoleView(this.drawer);
     // TODO: Uncomment when enabling the Changes Panel
@@ skipping 738 matching lines @@
     this.panels.scripts.addScript(sourceID, sourceURL, source, startingLine);
 }
 
 WebInspector.failedToParseScriptSource = function(sourceURL, source, startingLine, errorLine, errorMessage)
 {
     this.panels.scripts.addScript(null, sourceURL, source, startingLine, errorLine, errorMessage);
 }
 
 WebInspector.pausedScript = function(callFrames)
 {
+    callFrames = JSON.parse(callFrames);
     this.panels.scripts.debuggerPaused(callFrames);
 }
 
 WebInspector.resumedScript = function()
 {
     this.panels.scripts.debuggerResumed();
 }
 
 WebInspector.populateInterface = function()
 {
@@ skipping 36 matching lines @@
     // Cleanup elements panel early on inspected page refresh.
     WebInspector.setDocument(null);
 }
 
 WebInspector.updateConsoleMessageExpiredCount = function(count)
 {
     var message = String.sprintf(WebInspector.UIString("%d console messages are not shown."), count);
     WebInspector.console.addMessage(new WebInspector.ConsoleTextMessage(message, WebInspector.ConsoleMessage.MessageLevel.Warning));
 }
 
-WebInspector.addConsoleMessage = function(payload)
+WebInspector.addConsoleMessage = function(payload, argumentsStringified, opt_args)
 {
     var consoleMessage = new WebInspector.ConsoleMessage(
         payload.source,
         payload.type,
         payload.level,
         payload.line,
         payload.url,
         payload.groupLevel,
         payload.repeatCount);
-    consoleMessage.setMessageBody(Array.prototype.slice.call(arguments, 1));
+    var parsedArguments = [];
+    for (var i = 2; i < arguments.length; i++) {
+        if (argumentsStringified)
+            parsedArguments.push(JSON.parse(arguments[i]));
+        else
+            parsedArguments.push(arguments[i]);
+    }
+    consoleMessage.setMessageBody(parsedArguments);
     this.console.addMessage(consoleMessage);
 }
 
 WebInspector.updateConsoleMessageRepeatCount = function(count)
 {
     this.console.updateMessageRepeatCount(count);
 }
 
 WebInspector.log = function(message)
 {
@@ skipping 36 matching lines @@
     function logMessage(message)
     {
         var repeatCount = 1;
         if (message == WebInspector.log.lastMessage)
             repeatCount = WebInspector.log.repeatCount + 1;
 
         WebInspector.log.lastMessage = message;
         WebInspector.log.repeatCount = repeatCount;
 
         // ConsoleMessage expects a proxy object
-        message = new WebInspector.ObjectProxy(null, [], 0, message, false);
+        message = new WebInspector.ObjectProxy(null, null, [], 0, message, false);
 
         // post the message
         var msg = new WebInspector.ConsoleMessage(
             WebInspector.ConsoleMessage.MessageSource.Other,
             WebInspector.ConsoleMessage.MessageType.Log,
             WebInspector.ConsoleMessage.MessageLevel.Debug,
             -1,
             null,
             null,
             repeatCount,
@@ skipping 467 matching lines @@
     "text/ecmascript":             {4: true},
     "application/javascript":      {4: true},
     "application/ecmascript":      {4: true},
     "application/x-javascript":    {4: true},
     "text/javascript1.1":          {4: true},
     "text/javascript1.2":          {4: true},
     "text/javascript1.3":          {4: true},
     "text/jscript":                {4: true},
     "text/livescript":             {4: true},
 }