DevTools: properly support targets in LiveEditSupport

Source/devtools/front_end/sdk/LiveEditSupport.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
+ * @extends {WebInspector.TargetAware}
+ * @param {!WebInspector.Target} target
  * @param {!WebInspector.Workspace} workspace
  */
-WebInspector.LiveEditSupport = function(workspace)
+WebInspector.LiveEditSupport = function(target, workspace)
 {
+    WebInspector.TargetAware.call(this, target);
     this._workspace = workspace;
-    this._projectId = "liveedit:";
+    this._projectId = "liveedit:" + target.id();
     this._projectDelegate = new WebInspector.DebuggerProjectDelegate(workspace, this._projectId, WebInspector.projectTypes.LiveEdit);
-    WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);
+    target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);
     this._debuggerReset();
 }
 
 WebInspector.LiveEditSupport.prototype = {
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {!WebInspector.UISourceCode}
      */
     uiSourceCodeForLiveEdit: function(uiSourceCode)
     {
-        var rawLocation = uiSourceCode.uiLocationToRawLocation(WebInspector.targetManager.targets()[0], 0, 0);
+        var rawLocation = uiSourceCode.uiLocationToRawLocation(this.target(), 0, 0);
         var debuggerModelLocation = /** @type {!WebInspector.DebuggerModel.Location} */ (rawLocation);
         var script = debuggerModelLocation.script();
         var uiLocation = script.rawLocationToUILocation(0, 0);
 
         // FIXME: Support live editing of scripts mapped to some file.
         if (uiLocation.uiSourceCode !== uiSourceCode)
             return uiLocation.uiSourceCode;
         if (this._uiSourceCodeForScriptId[script.scriptId])
             return this._uiSourceCodeForScriptId[script.scriptId];
 
@@ skipping 16 matching lines @@
         this._projectDelegate.reset();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _workingCopyCommitted: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.target);
         var scriptId = /** @type {string} */ (this._scriptIdForUISourceCode.get(uiSourceCode));
-        WebInspector.debuggerModel.setScriptSource(scriptId, uiSourceCode.workingCopy(), innerCallback);
+        this.target().debuggerModel.setScriptSource(scriptId, uiSourceCode.workingCopy(), innerCallback.bind(this));
 
         /**
+         * @this {WebInspector.LiveEditSupport}
          * @param {?string} error
          * @param {!DebuggerAgent.SetScriptSourceError=} errorData
          */
         function innerCallback(error, errorData)
         {
             if (error) {
-                var script = WebInspector.debuggerModel.scriptForId(scriptId);
-                WebInspector.LiveEditSupport.logDetailedError(error, errorData, script);
+                var script = this.target().debuggerModel.scriptForId(scriptId);
+                WebInspector.LiveEditSupport.logDetailedError(this.target(), error, errorData, script);
                 return;
             }
-            WebInspector.LiveEditSupport.logSuccess();
+            WebInspector.LiveEditSupport.logSuccess(this.target());
         }
-    }
+    },
+
+    __proto__: WebInspector.TargetAware.prototype
 }
 
 /**
- * @param {?string} error
- * @param {!DebuggerAgent.SetScriptSourceError=} errorData
- * @param {!WebInspector.Script=} contextScript
- */
-WebInspector.LiveEditSupport.logDetailedError = function(error, errorData, contextScript)
+* @param {!WebInspector.Target} target
+* @param {?string} error
+* @param {!DebuggerAgent.SetScriptSourceError=} errorData
+* @param {!WebInspector.Script=} contextScript
+*/
+WebInspector.LiveEditSupport.logDetailedError = function(target, error, errorData, contextScript)
 {
     var warningLevel = WebInspector.ConsoleMessage.MessageLevel.Warning;
     if (!errorData) {
         if (error)
-            WebInspector.messageSink.addMessage(WebInspector.UIString("LiveEdit failed: %s", error), warningLevel);
+            target.consoleModel.log(WebInspector.UIString("LiveEdit failed: %s", error), warningLevel, false);
         return;
     }
     var compileError = errorData.compileError;
     if (compileError) {
         var location = contextScript ? WebInspector.UIString(" at %s:%d:%d", contextScript.sourceURL, compileError.lineNumber, compileError.columnNumber) : "";
         var message = WebInspector.UIString("LiveEdit compile failed: %s%s", compileError.message, location);
-        WebInspector.messageSink.addErrorMessage(message);
+        target.consoleModel.log(message, WebInspector.ConsoleMessage.MessageLevel.Error, false);
     } else {
-        WebInspector.messageSink.addMessage(WebInspector.UIString("Unknown LiveEdit error: %s; %s", JSON.stringify(errorData), error), warningLevel);
+        target.consoleModel.log(WebInspector.UIString("Unknown LiveEdit error: %s; %s", JSON.stringify(errorData), error), warningLevel, false);
     }
 }
 
-WebInspector.LiveEditSupport.logSuccess = function()
+/**
+ * @param {!WebInspector.Target} target
+ */
+WebInspector.LiveEditSupport.logSuccess = function(target)
 {
-    WebInspector.messageSink.addMessage(WebInspector.UIString("Recompilation and update succeeded."));
+    target.consoleModel.log(WebInspector.UIString("Recompilation and update succeeded."), WebInspector.ConsoleMessage.MessageLevel.Debug, false);
 }
-
-/** @type {!WebInspector.LiveEditSupport} */
-WebInspector.liveEditSupport;