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

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

Issue 397313003: DevTools: Remove target function from TimelineModel (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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
Index: Source/devtools/front_end/timeline/TracingTimelineUIUtils.js
diff --git a/Source/devtools/front_end/timeline/TracingTimelineUIUtils.js b/Source/devtools/front_end/timeline/TracingTimelineUIUtils.js
index e0cdf424bcd916557957b61cbc0099271aaa6578..4162da016bd049cf02e276d49a5e3596e7282c1e 100644
--- a/Source/devtools/front_end/timeline/TracingTimelineUIUtils.js
+++ b/Source/devtools/front_end/timeline/TracingTimelineUIUtils.js
@@ -92,7 +92,7 @@ WebInspector.TracingTimelineUIUtils.prototype = {
*/
buildDetailsNode: function(record, linkifier, loadedFromFile)
{
- return WebInspector.TracingTimelineUIUtils.buildDetailsNodeForTraceEvent(record.traceEvent(), linkifier, loadedFromFile, record.target());
+ return WebInspector.TracingTimelineUIUtils.buildDetailsNodeForTraceEvent(record.traceEvent(), linkifier);
},
/**
@@ -107,7 +107,7 @@ WebInspector.TracingTimelineUIUtils.prototype = {
if (!(model instanceof WebInspector.TracingTimelineModel))
throw new Error("Illegal argument.");
var tracingTimelineModel = /** @type {!WebInspector.TracingTimelineModel} */ (model);
- WebInspector.TracingTimelineUIUtils.buildTraceEventDetails(record.traceEvent(), tracingTimelineModel, linkifier, callback, loadedFromFile, record.target());
+ WebInspector.TracingTimelineUIUtils.buildTraceEventDetails(record.traceEvent(), tracingTimelineModel, linkifier, callback, loadedFromFile);
},
/**
@@ -330,14 +330,12 @@ WebInspector.TracingTimelineUIUtils.isEventDivider = function(record)
/**
* @param {!WebInspector.TracingModel.Event} event
* @param {!WebInspector.Linkifier} linkifier
- * @param {boolean} loadedFromFile
- * @param {!WebInspector.Target} target
* @return {?Node}
*/
-WebInspector.TracingTimelineUIUtils.buildDetailsNodeForTraceEvent = function(event, linkifier, loadedFromFile, target)
+WebInspector.TracingTimelineUIUtils.buildDetailsNodeForTraceEvent = function(event, linkifier)
{
var recordType = WebInspector.TracingTimelineModel.RecordType;
-
+ var target = event.thread.target();
var details;
var detailsText;
var eventData = event.args.data;
@@ -433,21 +431,11 @@ WebInspector.TracingTimelineUIUtils.buildDetailsNodeForTraceEvent = function(eve
*/
function linkifyLocation(scriptId, url, lineNumber, columnNumber)
{
- if (!loadedFromFile && scriptId !== "0") {
- var location = new WebInspector.DebuggerModel.Location(
- target,
- scriptId,
- lineNumber - 1,
- (columnNumber || 1) - 1);
- return linkifier.linkifyRawLocation(location, "timeline-details");
- }
-
if (!url)
return null;
// FIXME(62725): stack trace line/column numbers are one-based.
- columnNumber = columnNumber ? columnNumber - 1 : 0;
- return linkifier.linkifyLocation(target, url, lineNumber - 1, columnNumber, "timeline-details");
+ return linkifier.linkifyLocationByScriptId(target, scriptId, url, lineNumber - 1, (columnNumber ||1) - 1, "timeline-details");
}
/**
@@ -481,17 +469,21 @@ WebInspector.TracingTimelineUIUtils.buildDetailsNodeForTraceEvent = function(eve
* @param {!WebInspector.Linkifier} linkifier
* @param {function(!DocumentFragment)} callback
* @param {boolean} loadedFromFile
- * @param {!WebInspector.Target} target
*/
-WebInspector.TracingTimelineUIUtils.buildTraceEventDetails = function(event, model, linkifier, callback, loadedFromFile, target)
+WebInspector.TracingTimelineUIUtils.buildTraceEventDetails = function(event, model, linkifier, callback, loadedFromFile)
{
+ var target = event.thread.target();
+ //FIXME: support here nullable target
+ if (!target)
+ return;
+
var relatedNode = null;
var barrier = new CallbackBarrier();
if (!event.previewElement) {
if (event.imageURL)
WebInspector.DOMPresentationUtils.buildImagePreviewContents(target, event.imageURL, false, barrier.createCallback(saveImage));
else if (event.picture)
- WebInspector.TracingTimelineUIUtils.buildPicturePreviewContent(model.target(), event.picture, barrier.createCallback(saveImage));
+ WebInspector.TracingTimelineUIUtils.buildPicturePreviewContent(target, event.picture, barrier.createCallback(saveImage));
}
if (event.backendNodeId)
target.domModel.pushNodesByBackendIdsToFrontend([event.backendNodeId], barrier.createCallback(setRelatedNode));
@@ -516,7 +508,7 @@ WebInspector.TracingTimelineUIUtils.buildTraceEventDetails = function(event, mod
function callbackWrapper()
{
- callback(WebInspector.TracingTimelineUIUtils._buildTraceEventDetailsSynchronously(event, model, linkifier, relatedNode, loadedFromFile, target));
+ callback(WebInspector.TracingTimelineUIUtils._buildTraceEventDetailsSynchronously(event, model, linkifier, relatedNode, loadedFromFile, /** @type {!WebInspector.Target} */ (target)));
}
}
@@ -653,7 +645,7 @@ WebInspector.TracingTimelineUIUtils._buildTraceEventDetailsSynchronously = funct
contentHelper.appendTextRow(WebInspector.UIString("Callback Function"), eventData["callbackName"]);
break;
default:
- var detailsNode = WebInspector.TracingTimelineUIUtils.buildDetailsNodeForTraceEvent(event, linkifier, loadedFromFile, target);
+ var detailsNode = WebInspector.TracingTimelineUIUtils.buildDetailsNodeForTraceEvent(event, linkifier);
if (detailsNode)
contentHelper.appendElementRow(WebInspector.UIString("Details"), detailsNode);
break;

Powered by Google App Engine
This is Rietveld 408576698