Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1754)

Unified Diff: Source/devtools/front_end/timeline/TimelineUIUtils.js

Issue 305133004: Eliminate url() method on TimelineModel.Record (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/timeline/TimelineModel.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/timeline/TimelineUIUtils.js
diff --git a/Source/devtools/front_end/timeline/TimelineUIUtils.js b/Source/devtools/front_end/timeline/TimelineUIUtils.js
index 5668bb72e24724cdcdf2570cfc61e89fd9b64ec5..3f6a3fceeb4441c0c8c8114dbeec8c052ab53fe7 100644
--- a/Source/devtools/front_end/timeline/TimelineUIUtils.js
+++ b/Source/devtools/front_end/timeline/TimelineUIUtils.js
@@ -550,7 +550,11 @@ WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(recor
case recordTypes.ResourceReceiveResponse:
case recordTypes.ResourceReceivedData:
case recordTypes.ResourceFinish:
- var url = record.url();
+ var url;
+ if (record.type() === recordTypes.ResourceSendRequest)
+ url = recordData["url"];
+ else if (record.initiator())
+ url = record.initiator().data()["url"];
if (url)
contentHelper.appendElementRow(WebInspector.UIString("Resource"), WebInspector.linkifyResourceAsNode(url));
if (imagePreviewElement)
@@ -585,7 +589,7 @@ WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(recor
case recordTypes.DecodeImage:
case recordTypes.ResizeImage:
relatedNodeLabel = WebInspector.UIString("Image element");
- var url = record.url();
+ var url = recordData["url"];
if (url)
contentHelper.appendElementRow(WebInspector.UIString("Image URL"), WebInspector.linkifyResourceAsNode(url));
break;
@@ -989,15 +993,22 @@ WebInspector.TimelineUIUtils.buildDetailsNode = function(record, linkifier, load
case WebInspector.TimelineModel.RecordType.XHRReadyStateChange:
case WebInspector.TimelineModel.RecordType.XHRLoad:
case WebInspector.TimelineModel.RecordType.ResourceSendRequest:
- case WebInspector.TimelineModel.RecordType.ResourceReceivedData:
- case WebInspector.TimelineModel.RecordType.ResourceReceiveResponse:
- case WebInspector.TimelineModel.RecordType.ResourceFinish:
case WebInspector.TimelineModel.RecordType.DecodeImage:
case WebInspector.TimelineModel.RecordType.ResizeImage:
- var url = record.url();
+ var url = recordData["url"];
if (url)
detailsText = WebInspector.displayNameForURL(url);
break;
+ case WebInspector.TimelineModel.RecordType.ResourceReceivedData:
+ case WebInspector.TimelineModel.RecordType.ResourceReceiveResponse:
+ case WebInspector.TimelineModel.RecordType.ResourceFinish:
+ var initiator = record.initiator();
+ if (initiator) {
+ var url = initiator.data()["url"];
+ if (url)
+ detailsText = WebInspector.displayNameForURL(url);
+ }
+ break;
case WebInspector.TimelineModel.RecordType.ConsoleTime:
detailsText = recordData["message"];
break;
« no previous file with comments | « Source/devtools/front_end/timeline/TimelineModel.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698