Index: Source/devtools/front_end/timeline/TracingTimelineModel.js |
diff --git a/Source/devtools/front_end/timeline/TracingTimelineModel.js b/Source/devtools/front_end/timeline/TracingTimelineModel.js |
index dc5c411333ae6b44c981c055bc47641709e5e004..85694c2b30e6eb2d33f4c887690c560a587d7d8d 100644 |
--- a/Source/devtools/front_end/timeline/TracingTimelineModel.js |
+++ b/Source/devtools/front_end/timeline/TracingTimelineModel.js |
@@ -434,45 +434,45 @@ WebInspector.TracingTimelineModel.prototype = { |
switch (event.name) { |
case recordTypes.CallStack: |
var lastMainThreadEvent = this.mainThreadEvents().peekLast(); |
- if (lastMainThreadEvent && event.args.stack && event.args.stack.length) |
- lastMainThreadEvent.stackTrace = event.args.stack; |
+ if (lastMainThreadEvent && event.args["stack"] && event.args["stack"].length) |
+ lastMainThreadEvent.stackTrace = event.args["stack"]; |
break; |
case recordTypes.ResourceSendRequest: |
- this._sendRequestEvents[event.args.data["requestId"]] = event; |
- event.imageURL = event.args.data["url"]; |
+ this._sendRequestEvents[event.dataArg["requestId"]] = event; |
+ event.imageURL = event.dataArg["url"]; |
break; |
case recordTypes.ResourceReceiveResponse: |
case recordTypes.ResourceReceivedData: |
case recordTypes.ResourceFinish: |
- event.initiator = this._sendRequestEvents[event.args.data["requestId"]]; |
+ event.initiator = this._sendRequestEvents[event.dataArg["requestId"]]; |
if (event.initiator) |
event.imageURL = event.initiator.imageURL; |
break; |
case recordTypes.TimerInstall: |
- this._timerEvents[event.args.data["timerId"]] = event; |
+ this._timerEvents[event.dataArg["timerId"]] = event; |
break; |
case recordTypes.TimerFire: |
- event.initiator = this._timerEvents[event.args.data["timerId"]]; |
+ event.initiator = this._timerEvents[event.dataArg["timerId"]]; |
break; |
case recordTypes.RequestAnimationFrame: |
- this._requestAnimationFrameEvents[event.args.data["id"]] = event; |
+ this._requestAnimationFrameEvents[event.dataArg["id"]] = event; |
break; |
case recordTypes.FireAnimationFrame: |
- event.initiator = this._requestAnimationFrameEvents[event.args.data["id"]]; |
+ event.initiator = this._requestAnimationFrameEvents[event.dataArg["id"]]; |
break; |
case recordTypes.ScheduleStyleRecalculation: |
- this._lastScheduleStyleRecalculation[event.args.frame] = event; |
+ this._lastScheduleStyleRecalculation[event.args["frame"]] = event; |
break; |
case recordTypes.RecalculateStyles: |
- event.initiator = this._lastScheduleStyleRecalculation[event.args.frame]; |
+ event.initiator = this._lastScheduleStyleRecalculation[event.args["frame"]]; |
this._lastRecalculateStylesEvent = event; |
break; |
@@ -480,7 +480,7 @@ WebInspector.TracingTimelineModel.prototype = { |
// Consider style recalculation as a reason for layout invalidation, |
// but only if we had no earlier layout invalidation records. |
var layoutInitator = event; |
- var frameId = event.args.frame; |
+ var frameId = event.args["frame"]; |
if (!this._layoutInvalidate[frameId] && this._lastRecalculateStylesEvent && this._lastRecalculateStylesEvent.endTime > event.startTime) |
layoutInitator = this._lastRecalculateStylesEvent.initiator; |
this._layoutInvalidate[frameId] = layoutInitator; |
@@ -497,13 +497,13 @@ WebInspector.TracingTimelineModel.prototype = { |
break; |
case recordTypes.WebSocketCreate: |
- this._webSocketCreateEvents[event.args.data["identifier"]] = event; |
+ this._webSocketCreateEvents[event.dataArg["identifier"]] = event; |
break; |
case recordTypes.WebSocketSendHandshakeRequest: |
case recordTypes.WebSocketReceiveHandshakeResponse: |
case recordTypes.WebSocketDestroy: |
- event.initiator = this._webSocketCreateEvents[event.args.data["identifier"]]; |
+ event.initiator = this._webSocketCreateEvents[event.dataArg["identifier"]]; |
break; |
case recordTypes.EvaluateScript: |
@@ -517,13 +517,13 @@ WebInspector.TracingTimelineModel.prototype = { |
break; |
case recordTypes.Paint: |
- event.highlightQuad = event.args["data"]["clip"]; |
- event.backendNodeId = event.args["data"]["nodeId"]; |
+ event.highlightQuad = event.dataArg["clip"]; |
+ event.backendNodeId = event.dataArg["nodeId"]; |
var layerUpdateEvent = this._findAncestorEvent(recordTypes.UpdateLayer); |
if (!layerUpdateEvent || layerUpdateEvent.args["layerTreeId"] !== this._inspectedTargetLayerTreeId) |
break; |
// Only keep layer paint events, skip paints for subframes that get painted to the same layer as parent. |
- if (!event.args["data"]["layerId"]) |
+ if (!event.dataArg["layerId"]) |
break; |
this._lastPaintForLayer[layerUpdateEvent.args["layerId"]] = event; |
break; |
@@ -540,12 +540,12 @@ WebInspector.TracingTimelineModel.prototype = { |
break; |
case recordTypes.ScrollLayer: |
- event.backendNodeId = event.args["data"]["nodeId"]; |
+ event.backendNodeId = event.dataArg["nodeId"]; |
break; |
case recordTypes.PaintImage: |
- event.backendNodeId = event.args["data"]["nodeId"]; |
- event.imageURL = event.args["data"]["url"]; |
+ event.backendNodeId = event.dataArg["nodeId"]; |
+ event.imageURL = event.dataArg["url"]; |
break; |
case recordTypes.DecodeImage: |
@@ -764,7 +764,7 @@ WebInspector.TracingTimelineModel.TraceEventRecord.prototype = { |
*/ |
data: function() |
{ |
- return this._event.args.data; |
+ return this._event.dataArg; |
}, |
/** |
@@ -788,7 +788,7 @@ WebInspector.TracingTimelineModel.TraceEventRecord.prototype = { |
case WebInspector.TracingTimelineModel.RecordType.Layout: |
return this._event.args["beginData"]["frameId"]; |
default: |
- var data = this._event.args.data; |
+ var data = this._event.dataArg; |
return (data && data["frame"]) || ""; |
} |
}, |