DevTools: remove setScriptFile from UISourceCode.

DevTools: remove setScriptFile from UISourceCode.

[vsevik, 2014-04-09 10:39:42]

lgtm

https://codereview.chromium.org/228863002/diff/20001/Source/devtools/front_en...
File Source/devtools/front_end/ResourceScriptMapping.js (right):

https://codereview.chromium.org/228863002/diff/20001/Source/devtools/front_en...
Source/devtools/front_end/ResourceScriptMapping.js:233: return
this._scriptFiles.get(uiSourceCode) || null;
|| null is redundant

https://codereview.chromium.org/228863002/diff/20001/Source/devtools/front_en...
File Source/devtools/front_end/ScriptSnippetModel.js (right):

https://codereview.chromium.org/228863002/diff/20001/Source/devtools/front_en...
Source/devtools/front_end/ScriptSnippetModel.js:370: var scriptFile = /** @type
{?WebInspector.SnippetScriptFile} */ (this._scriptFiles.get(uiSourceCode));
No need to cast, since you don't store anything else in this map.

[vsevik, 2014-04-14 08:55:08]

ping, would you like to land it?

[pfeldman, 2014-04-14 09:21:34]

The CQ bit was checked by pfeldman@chromium.org

[commit-bot: I haz the power, 2014-04-14 09:21:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pfeldman@chromium.org/228863002/20001

[commit-bot: I haz the power, 2014-04-14 09:21:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-14 09:21:49]

Failed to apply patch for Source/devtools/front_end/LiveEditSupport.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/devtools/front_end/LiveEditSupport.js
  Hunk #1 FAILED at 59.
  Hunk #2 succeeded at 77 with fuzz 2 (offset 3 lines).
  Hunk #3 succeeded at 131 (offset 3 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
Source/devtools/front_end/LiveEditSupport.js.rej

Patch:       Source/devtools/front_end/LiveEditSupport.js
Index: Source/devtools/front_end/LiveEditSupport.js
diff --git a/Source/devtools/front_end/LiveEditSupport.js
b/Source/devtools/front_end/LiveEditSupport.js
index
2a7ffab2235b62c91af150225bc3c0ae3b528e48..2e271b35b6b46b81f0960637169b6a4cab0325d6
100644
--- a/Source/devtools/front_end/LiveEditSupport.js
+++ b/Source/devtools/front_end/LiveEditSupport.js
@@ -59,8 +59,8 @@ WebInspector.LiveEditSupport.prototype = {
 
         console.assert(!script.isInlineScript());
         var liveEditUISourceCode =
this._workspaceProvider.addUniqueFileForURL(script.sourceURL, script, true,
script.isContentScript);
+       
liveEditUISourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted,
this._workingCopyCommitted, this);
 
-        liveEditUISourceCode.setScriptFile(new
WebInspector.LiveEditScriptFile(uiSourceCode, liveEditUISourceCode,
script.scriptId));
         this._uiSourceCodeForScriptId[script.scriptId] = liveEditUISourceCode;
         this._scriptIdForUISourceCode.put(liveEditUISourceCode,
script.scriptId);
         return liveEditUISourceCode;
@@ -74,6 +74,30 @@ WebInspector.LiveEditSupport.prototype = {
         this._scriptIdForUISourceCode = new Map();
         this._workspaceProvider.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);
+
+        /**
+         * @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);
+                return;
+            }
+            WebInspector.LiveEditSupport.logSuccess();
+        }
+    }
 }
 
 /**
@@ -104,75 +128,5 @@ WebInspector.LiveEditSupport.logSuccess = function()
     WebInspector.console.log(WebInspector.UIString("Recompilation and update
succeeded."), WebInspector.ConsoleMessage.MessageLevel.Debug, false);
 }
 
-/**
- * @constructor
- * @implements {WebInspector.ScriptFile}
- * @extends {WebInspector.Object}
- * @param {!WebInspector.UISourceCode} uiSourceCode
- * @param {!WebInspector.UISourceCode} liveEditUISourceCode
- * @param {string} scriptId
- */
-WebInspector.LiveEditScriptFile = function(uiSourceCode, liveEditUISourceCode,
scriptId)
-{
-    WebInspector.ScriptFile.call(this);
-    this._uiSourceCode = uiSourceCode;
-    this._liveEditUISourceCode = liveEditUISourceCode;
-    this._scriptId = scriptId;
-   
this._liveEditUISourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted,
this._workingCopyCommitted, this);
-}
-
-WebInspector.LiveEditScriptFile.prototype = {
-    _workingCopyCommitted: function(event)
-    {
-        /**
-         * @param {?string} error
-         * @param {!DebuggerAgent.SetScriptSourceError=} errorData
-         * @this {WebInspector.LiveEditScriptFile}
-         */
-        function innerCallback(error, errorData)
-        {
-            if (error) {
-                var script =
WebInspector.debuggerModel.scriptForId(this._scriptId);
-                WebInspector.LiveEditSupport.logDetailedError(error, errorData,
script);
-                return;
-            }
-            WebInspector.LiveEditSupport.logSuccess();
-        }
-
-        var script = WebInspector.debuggerModel.scriptForId(this._scriptId);
-        WebInspector.debuggerModel.setScriptSource(script.scriptId,
this._liveEditUISourceCode.workingCopy(), innerCallback.bind(this));
-    },
-
-    /**
-     * @return {boolean}
-     */
-    hasDivergedFromVM: function()
-    {
-        return true;
-    },
-
-    /**
-     * @return {boolean}
-     */
-    isDivergingFromVM: function()
-    {
-        return false;
-    },
-
-    /**
-     * @return {boolean}
-     */
-    isMergingToVM: function()
-    {
-        return false;
-    },
-
-    checkMapping: function()
-    {
-    },
-
-    __proto__: WebInspector.Object.prototype
-}
-
 /** @type {!WebInspector.LiveEditSupport} */
 WebInspector.liveEditSupport;

[pfeldman, 2014-04-14 09:23:12]

On 2014/04/14 08:55:08, vsevik wrote:
> ping, would you like to land it?

Nope.