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 33 matching lines @@
 }
 
 /**
  * @constructor
  * @implements {WebInspector.TargetManager.Observer}
  * @param {!WebInspector.LinkifierFormatter=} formatter
  */
 WebInspector.Linkifier = function(formatter)
 {
     this._formatter = formatter || new WebInspector.Linkifier.DefaultFormatter(WebInspector.Linkifier.MaxLengthForDisplayedURLs);
     this._liveLocationsByTarget = new Map();

[aandrey, 2014/07/30 10:01:23]

jsdoc plz

[sergeyv, 2014/07/30 13:43:01]

Done.

     WebInspector.targetManager.observeTargets(this);
 }
 
 /**
  * @param {!WebInspector.Linkifier.LinkHandler} handler
  */
 WebInspector.Linkifier.setLinkHandler = function(handler)
 {
     WebInspector.Linkifier._linkHandler = handler;
 }
@@ skipping 70 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)
+    linkifyScriptLocation: function(target, scriptId, sourceURL, lineNumber, columnNumber, classes)
     {
-        var rawLocation = target ? target.debuggerModel.createRawLocationByScriptId(scriptId, sourceURL, lineNumber, columnNumber || 0) : null;
+        var rawLocation = target && !target.isDetached() ? 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 {string} sourceURL
-     * @param {number} lineNumber
-     * @param {number=} columnNumber
-     * @param {string=} classes
-     * @return {?Element}
-     */
-    linkifyLocation: function(target, sourceURL, lineNumber, columnNumber, classes)
-    {
-        var rawLocation = target.debuggerModel.createRawLocationByURL(sourceURL, lineNumber, columnNumber || 0);
-        if (!rawLocation)
-            return WebInspector.linkifyResourceAsNode(sourceURL, lineNumber, classes);
-        return this.linkifyRawLocation(rawLocation, classes);
     },
 
     /**
      * @param {!WebInspector.DebuggerModel.Location} rawLocation
+     * @param {string} fallbackUrl
      * @param {string=} classes
-     * @return {?Element}
+     * @return {!Element}
      */
-    linkifyRawLocation: function(rawLocation, classes)
+    linkifyRawLocation: function(rawLocation, fallbackUrl, classes)
     {
-        // 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 = WebInspector.debuggerWorkspaceBinding.createLiveLocation(rawLocation, this._updateAnchor.bind(this, anchor));
-        this._liveLocationsByTarget.get(rawLocation.target()).push({anchor: anchor, location: liveLocation});
-        return anchor;
+        return this.linkifyScriptLocation(rawLocation.target(), rawLocation.scriptId, fallbackUrl, rawLocation.lineNumber, rawLocation.columnNumber, classes);
     },
 
     /**
+     * @param {?WebInspector.Target} target
+     * @param {!ConsoleAgent.CallFrame} callFrame
+     * @param {string=} classes
+     * @return {!Element}
+     */
+    linkifyConsoleCallFrame: function(target, callFrame, classes)
+    {
+        // FIXME(62725): console stack trace line/column numbers are one-based.
+        var lineNumber = callFrame.lineNumber ? callFrame.lineNumber - 1 : 0;
+        var columnNumber = callFrame.columnNumber ? callFrame.columnNumber - 1 : 0;
+        return this.linkifyScriptLocation(target, callFrame.scriptId, callFrame.url, callFrame.lineNumber, callFrame.columnNumber, classes);
+    },
+
+    /**
      * @param {!WebInspector.CSSLocation} rawLocation
      * @param {string=} classes
      * @return {?Element}
      */
     linkifyCSSLocation: function(rawLocation, classes)
     {
         var anchor = this._createAnchor(classes);
         var liveLocation = WebInspector.cssWorkspaceBinding.createLiveLocation(rawLocation, this._updateAnchor.bind(this, anchor));
         if (!liveLocation)
             return null;
@@ skipping 149 matching lines @@
  */
 WebInspector.Linkifier.liveLocationText = function(target, scriptId, lineNumber, columnNumber)
 {
     var script = target.debuggerModel.scriptForId(scriptId);
     if (!script)
         return "";
     var location = /** @type {!WebInspector.DebuggerModel.Location} */ (target.debuggerModel.createRawLocation(script, lineNumber, columnNumber || 0));
     var uiLocation = /** @type {!WebInspector.UILocation} */ (WebInspector.debuggerWorkspaceBinding.rawLocationToUILocation(location));
     return uiLocation.linkText();
 }