Title: [127415] trunk/Source/WebCore
Revision
127415
Author
[email protected]
Date
2012-09-03 02:56:55 -0700 (Mon, 03 Sep 2012)

Log Message

Web Inspector: use linkifyResourceAsNode, not linkifyLocation when linkifying resources in Timeline
https://bugs.webkit.org/show_bug.cgi?id=95540

Reviewed by Pavel Feldman.

Linkify recource details using WebInspector.linkifyResourceAsNode(), so these bypass linkifier. Also
fix closure compiler warning.

* inspector/front-end/TimelinePresentationModel.js:
(WebInspector.TimelinePresentationModel.Record.prototype._generatePopupContentWithImagePreview):
(WebInspector.TimelinePresentationModel.Record.prototype._linkifyLocation):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (127414 => 127415)


--- trunk/Source/WebCore/ChangeLog	2012-09-03 09:45:46 UTC (rev 127414)
+++ trunk/Source/WebCore/ChangeLog	2012-09-03 09:56:55 UTC (rev 127415)
@@ -1,3 +1,17 @@
+2012-09-03  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: use linkifyResourceAsNode, not linkifyLocation when linkifying resources in Timeline
+        https://bugs.webkit.org/show_bug.cgi?id=95540
+
+        Reviewed by Pavel Feldman.
+
+        Linkify recource details using WebInspector.linkifyResourceAsNode(), so these bypass linkifier. Also
+        fix closure compiler warning.
+
+        * inspector/front-end/TimelinePresentationModel.js:
+        (WebInspector.TimelinePresentationModel.Record.prototype._generatePopupContentWithImagePreview):
+        (WebInspector.TimelinePresentationModel.Record.prototype._linkifyLocation):
+
 2012-09-03  'Pavel Feldman'  <[email protected]>
 
         Web Inspector: fixed front-end compilation warnings.

Modified: trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js (127414 => 127415)


--- trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js	2012-09-03 09:45:46 UTC (rev 127414)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js	2012-09-03 09:56:55 UTC (rev 127415)
@@ -751,7 +751,7 @@
             case recordTypes.ResourceReceiveResponse:
             case recordTypes.ResourceReceivedData:
             case recordTypes.ResourceFinish:
-                contentHelper._appendElementRow(WebInspector.UIString("Resource"), this._linkifyLocation(this.url));
+                contentHelper._appendElementRow(WebInspector.UIString("Resource"), WebInspector.linkifyResourceAsNode(this.url));
                 if (previewElement)
                     contentHelper._appendElementRow(WebInspector.UIString("Preview"), previewElement);
                 if (this.data["requestMethod"])
@@ -870,15 +870,14 @@
 
     /**
      * @param {string} url
-     * @param {number=} lineNumber
+     * @param {number} lineNumber
      * @param {number=} columnNumber
      */
     _linkifyLocation: function(url, lineNumber, columnNumber)
     {
         // FIXME(62725): stack trace line/column numbers are one-based.
-        lineNumber = lineNumber ? lineNumber - 1 : lineNumber;
         columnNumber = columnNumber ? columnNumber - 1 : 0;
-        return this._linkifier.linkifyLocation(url, lineNumber, columnNumber, "timeline-details");
+        return this._linkifier.linkifyLocation(url, lineNumber - 1, columnNumber, "timeline-details");
     },
 
     _linkifyCallFrame: function(callFrame)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to