Commit c9f1cff7 authored by yurys@chromium.org's avatar yurys@chromium.org

Eliminate url() method on TimelineModel.Record

All its usages have been inlined.

BUG=361045
R=alph@chromium.org

Review URL: https://codereview.chromium.org/305133004

git-svn-id: svn://svn.chromium.org/blink/trunk@175263 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 63c20103
...@@ -565,11 +565,6 @@ WebInspector.TimelineModel.Record = function() ...@@ -565,11 +565,6 @@ WebInspector.TimelineModel.Record = function()
} }
WebInspector.TimelineModel.Record.prototype = { WebInspector.TimelineModel.Record.prototype = {
/**
* @return {?string}
*/
url: function() { },
/** /**
* @return {?Array.<!ConsoleAgent.CallFrame>} * @return {?Array.<!ConsoleAgent.CallFrame>}
*/ */
...@@ -766,19 +761,6 @@ WebInspector.TimelineModel.RecordImpl = function(model, timelineEvent, parentRec ...@@ -766,19 +761,6 @@ WebInspector.TimelineModel.RecordImpl = function(model, timelineEvent, parentRec
} }
WebInspector.TimelineModel.RecordImpl.prototype = { WebInspector.TimelineModel.RecordImpl.prototype = {
/**
* @return {?string}
*/
url: function()
{
var data = this.data();
if (data && data["url"])
return data["url"];
if (this._initiator)
return this._initiator.url();
return null;
},
/** /**
* @return {?Array.<!ConsoleAgent.CallFrame>} * @return {?Array.<!ConsoleAgent.CallFrame>}
*/ */
......
...@@ -550,7 +550,11 @@ WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(recor ...@@ -550,7 +550,11 @@ WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(recor
case recordTypes.ResourceReceiveResponse: case recordTypes.ResourceReceiveResponse:
case recordTypes.ResourceReceivedData: case recordTypes.ResourceReceivedData:
case recordTypes.ResourceFinish: 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) if (url)
contentHelper.appendElementRow(WebInspector.UIString("Resource"), WebInspector.linkifyResourceAsNode(url)); contentHelper.appendElementRow(WebInspector.UIString("Resource"), WebInspector.linkifyResourceAsNode(url));
if (imagePreviewElement) if (imagePreviewElement)
...@@ -585,7 +589,7 @@ WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(recor ...@@ -585,7 +589,7 @@ WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(recor
case recordTypes.DecodeImage: case recordTypes.DecodeImage:
case recordTypes.ResizeImage: case recordTypes.ResizeImage:
relatedNodeLabel = WebInspector.UIString("Image element"); relatedNodeLabel = WebInspector.UIString("Image element");
var url = record.url(); var url = recordData["url"];
if (url) if (url)
contentHelper.appendElementRow(WebInspector.UIString("Image URL"), WebInspector.linkifyResourceAsNode(url)); contentHelper.appendElementRow(WebInspector.UIString("Image URL"), WebInspector.linkifyResourceAsNode(url));
break; break;
...@@ -989,15 +993,22 @@ WebInspector.TimelineUIUtils.buildDetailsNode = function(record, linkifier, load ...@@ -989,15 +993,22 @@ WebInspector.TimelineUIUtils.buildDetailsNode = function(record, linkifier, load
case WebInspector.TimelineModel.RecordType.XHRReadyStateChange: case WebInspector.TimelineModel.RecordType.XHRReadyStateChange:
case WebInspector.TimelineModel.RecordType.XHRLoad: case WebInspector.TimelineModel.RecordType.XHRLoad:
case WebInspector.TimelineModel.RecordType.ResourceSendRequest: 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.DecodeImage:
case WebInspector.TimelineModel.RecordType.ResizeImage: case WebInspector.TimelineModel.RecordType.ResizeImage:
var url = record.url(); var url = recordData["url"];
if (url) if (url)
detailsText = WebInspector.displayNameForURL(url); detailsText = WebInspector.displayNameForURL(url);
break; 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: case WebInspector.TimelineModel.RecordType.ConsoleTime:
detailsText = recordData["message"]; detailsText = recordData["message"];
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment