| Index: Source/devtools/front_end/sdk/Linkifier.js
|
| diff --git a/Source/devtools/front_end/sdk/Linkifier.js b/Source/devtools/front_end/sdk/Linkifier.js
|
| index 5be06cfca6b96e3a44b22b1e5ed12f4dcd1e983f..e09a4fc23713d0ea7e5a7b0640bda54968521f1e 100644
|
| --- a/Source/devtools/front_end/sdk/Linkifier.js
|
| +++ b/Source/devtools/front_end/sdk/Linkifier.js
|
| @@ -142,57 +142,36 @@ WebInspector.Linkifier.prototype = {
|
|
|
| /**
|
| * @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);
|
| },
|
|
|
| /**
|
|
|