DevTools: Refactor linkifyRawLocation to use fallback url

Source/devtools/front_end/sdk/Linkifier.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 124 matching lines @@
                 anchor.title = anchor.__fallbackAnchor.title;
                 anchor.className = anchor.__fallbackAnchor.className;
                 anchor.textContent = anchor.__fallbackAnchor.textContent;
             }
             liveLocations[i].location.dispose();
         }
     },
 
     /**
      * @param {?WebInspector.Target} target
-     * @param {string} scriptId
+     * @param {?string} scriptId
      * @param {string} sourceURL
      * @param {number} lineNumber
      * @param {number=} columnNumber
      * @param {string=} classes
-     * @return {?Element}
+     * @return {!Element}
      */
     linkifyLocationByScriptId: function(target, scriptId, sourceURL, lineNumber, columnNumber, classes)
     {
-        var rawLocation = target ? target.debuggerModel.createRawLocationByScriptId(scriptId, sourceURL, lineNumber, columnNumber || 0) : null;
+        var rawLocation = target && !target.isDead() ? target.debuggerModel.createRawLocationByScriptId(scriptId, sourceURL, lineNumber, columnNumber || 0) : null;
         var fallbackAnchor = WebInspector.linkifyResourceAsNode(sourceURL, lineNumber, classes);
         if (!rawLocation)
             return fallbackAnchor;
 
-        var anchor = this.linkifyRawLocation(rawLocation, classes);
+        var anchor = this._createAnchor(classes);
+        var liveLocation = rawLocation.createLiveLocation(this._updateAnchor.bind(this, anchor));
+        this._liveLocationsByTarget.get(rawLocation.target()).push({anchor: anchor, location: liveLocation});
         anchor.__fallbackAnchor = fallbackAnchor;
         return anchor;
-
     },
 
     /**
-     * @param {!WebInspector.Target} target
+     * @param {?WebInspector.Target} target
      * @param {string} sourceURL
      * @param {number} lineNumber
      * @param {number=} columnNumber
      * @param {string=} classes
-     * @return {?Element}
+     * @return {!Element}
      */
     linkifyLocation: function(target, sourceURL, lineNumber, columnNumber, classes)

[vsevik, 2014/07/21 06:54:46]

This method seems confusing now, should we remove it?
Could you please make sure it was only used for scripts?

[sergeyv, 2014/07/21 12:06:54]

Done.

     {
-        var rawLocation = target.debuggerModel.createRawLocationByURL(sourceURL, lineNumber, columnNumber || 0);
-        if (!rawLocation)
-            return WebInspector.linkifyResourceAsNode(sourceURL, lineNumber, classes);
-        return this.linkifyRawLocation(rawLocation, classes);
+        return this.linkifyLocationByScriptId(target, null, sourceURL, lineNumber, columnNumber, classes);
     },
 
     /**
-     * @param {!WebInspector.DebuggerModel.Location} rawLocation
-     * @param {string=} classes
-     * @return {?Element}
-     */
-    linkifyRawLocation: function(rawLocation, classes)

[vsevik, 2014/07/21 07:24:28]

Could we keep this method and add sourceURL to rawLocation instead?

-    {
-        // FIXME: this check should not be here.
-        var script = rawLocation.target().debuggerModel.scriptForId(rawLocation.scriptId);
-        if (!script)
-            return null;
-        var anchor = this._createAnchor(classes);
-        var liveLocation = rawLocation.createLiveLocation(this._updateAnchor.bind(this, anchor));
-        this._liveLocationsByTarget.get(rawLocation.target()).push({anchor: anchor, location: liveLocation});
-        return anchor;
-    },
-
-    /**
      * @param {?CSSAgent.StyleSheetId} styleSheetId
      * @param {!WebInspector.CSSLocation} rawLocation
      * @param {string=} classes
      * @return {?Element}
      */
     linkifyCSSLocation: function(styleSheetId, rawLocation, classes)
     {
         var anchor = this._createAnchor(classes);
         var liveLocation = rawLocation.createLiveLocation(styleSheetId, this._updateAnchor.bind(this, anchor));
         if (!liveLocation)
@@ skipping 135 matching lines @@
  * @return {string}
  */
 WebInspector.Linkifier.liveLocationText = function(target, scriptId, lineNumber, columnNumber)
 {
     var script = target.debuggerModel.scriptForId(scriptId);
     if (!script)
         return "";
     var uiLocation = script.rawLocationToUILocation(lineNumber, columnNumber);
     return uiLocation.linkText();
 }