Commit 2a72b76f authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

DevTools: move TracingModel.js into the sdk module.

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

git-svn-id: svn://svn.chromium.org/blink/trunk@180174 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 75879aff
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
'front_end/sdk/Target.js', 'front_end/sdk/Target.js',
'front_end/sdk/TempFile.js', 'front_end/sdk/TempFile.js',
'front_end/sdk/TimelineManager.js', 'front_end/sdk/TimelineManager.js',
'front_end/sdk/TracingModel.js',
'front_end/sdk/UISourceCode.js', 'front_end/sdk/UISourceCode.js',
'front_end/sdk/WorkerManager.js', 'front_end/sdk/WorkerManager.js',
'front_end/sdk/WorkerTargetManager.js', 'front_end/sdk/WorkerTargetManager.js',
...@@ -501,7 +502,6 @@ ...@@ -501,7 +502,6 @@
'front_end/timeline/TimelineUIUtils.js', 'front_end/timeline/TimelineUIUtils.js',
'front_end/timeline/TimelineUIUtilsImpl.js', 'front_end/timeline/TimelineUIUtilsImpl.js',
'front_end/timeline/TimelineView.js', 'front_end/timeline/TimelineView.js',
'front_end/timeline/TracingModel.js',
'front_end/timeline/TracingTimelineModel.js', 'front_end/timeline/TracingTimelineModel.js',
'front_end/timeline/TracingTimelineUIUtils.js', 'front_end/timeline/TracingTimelineUIUtils.js',
'front_end/timeline/TransformController.js', 'front_end/timeline/TransformController.js',
......
...@@ -98,6 +98,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -98,6 +98,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<script type="text/javascript" src="sdk/ResourceUtils.js"></script> <script type="text/javascript" src="sdk/ResourceUtils.js"></script>
<script type="text/javascript" src="sdk/ResourceType.js"></script> <script type="text/javascript" src="sdk/ResourceType.js"></script>
<script type="text/javascript" src="sdk/TimelineManager.js"></script> <script type="text/javascript" src="sdk/TimelineManager.js"></script>
<script type="text/javascript" src="sdk/TracingModel.js"></script>
<script type="text/javascript" src="sdk/PowerProfiler.js"></script> <script type="text/javascript" src="sdk/PowerProfiler.js"></script>
<script type="text/javascript" src="sdk/OverridesSupport.js"></script> <script type="text/javascript" src="sdk/OverridesSupport.js"></script>
<script type="text/javascript" src="sdk/Database.js"></script> <script type="text/javascript" src="sdk/Database.js"></script>
......
...@@ -267,7 +267,7 @@ WebInspector.TimelineFlameChartDataProvider.prototype = { ...@@ -267,7 +267,7 @@ WebInspector.TimelineFlameChartDataProvider.prototype = {
var numFrames = e.stackTrace.length; var numFrames = e.stackTrace.length;
for (var j = 0; j < numFrames && j < stackTraceOpenEvents.length; ++j) { for (var j = 0; j < numFrames && j < stackTraceOpenEvents.length; ++j) {
var frame = e.stackTrace[numFrames - 1 - j]; var frame = e.stackTrace[numFrames - 1 - j];
if (!equalFrames(frame, stackTraceOpenEvents[j].args.data)) if (!equalFrames(frame, stackTraceOpenEvents[j].args["data"]))
break; break;
stackTraceOpenEvents[j].endTime = Math.max(stackTraceOpenEvents[j].endTime, eventEndTime(e)); stackTraceOpenEvents[j].endTime = Math.max(stackTraceOpenEvents[j].endTime, eventEndTime(e));
stackTraceOpenEvents[j].duration = stackTraceOpenEvents[j].endTime - stackTraceOpenEvents[j].startTime; stackTraceOpenEvents[j].duration = stackTraceOpenEvents[j].endTime - stackTraceOpenEvents[j].startTime;
...@@ -364,7 +364,7 @@ WebInspector.TimelineFlameChartDataProvider.prototype = { ...@@ -364,7 +364,7 @@ WebInspector.TimelineFlameChartDataProvider.prototype = {
if (!event) if (!event)
return this._entryIndexToFrame[entryIndex] ? "white" : "#555"; return this._entryIndexToFrame[entryIndex] ? "white" : "#555";
if (event.name === WebInspector.TracingTimelineModel.RecordType.JSFrame) if (event.name === WebInspector.TracingTimelineModel.RecordType.JSFrame)
return WebInspector.TimelineFlameChartDataProvider.jsFrameColorGenerator().colorForID(event.args.data["functionName"]); return WebInspector.TimelineFlameChartDataProvider.jsFrameColorGenerator().colorForID(event.args["data"]["functionName"]);
var style = WebInspector.TracingTimelineUIUtils.styleForTraceEvent(event.name); var style = WebInspector.TracingTimelineUIUtils.styleForTraceEvent(event.name);
return style.category.fillColorStop1; return style.category.fillColorStop1;
}, },
......
...@@ -441,45 +441,45 @@ WebInspector.TracingTimelineModel.prototype = { ...@@ -441,45 +441,45 @@ WebInspector.TracingTimelineModel.prototype = {
switch (event.name) { switch (event.name) {
case recordTypes.CallStack: case recordTypes.CallStack:
var lastMainThreadEvent = this.mainThreadEvents().peekLast(); var lastMainThreadEvent = this.mainThreadEvents().peekLast();
if (lastMainThreadEvent && event.args.stack && event.args.stack.length) if (lastMainThreadEvent && event.args["stack"] && event.args["stack"].length)
lastMainThreadEvent.stackTrace = event.args.stack; lastMainThreadEvent.stackTrace = event.args["stack"];
break; break;
case recordTypes.ResourceSendRequest: case recordTypes.ResourceSendRequest:
this._sendRequestEvents[event.args.data["requestId"]] = event; this._sendRequestEvents[event.args["data"]["requestId"]] = event;
event.imageURL = event.args.data["url"]; event.imageURL = event.args["data"]["url"];
break; break;
case recordTypes.ResourceReceiveResponse: case recordTypes.ResourceReceiveResponse:
case recordTypes.ResourceReceivedData: case recordTypes.ResourceReceivedData:
case recordTypes.ResourceFinish: case recordTypes.ResourceFinish:
event.initiator = this._sendRequestEvents[event.args.data["requestId"]]; event.initiator = this._sendRequestEvents[event.args["data"]["requestId"]];
if (event.initiator) if (event.initiator)
event.imageURL = event.initiator.imageURL; event.imageURL = event.initiator.imageURL;
break; break;
case recordTypes.TimerInstall: case recordTypes.TimerInstall:
this._timerEvents[event.args.data["timerId"]] = event; this._timerEvents[event.args["data"]["timerId"]] = event;
break; break;
case recordTypes.TimerFire: case recordTypes.TimerFire:
event.initiator = this._timerEvents[event.args.data["timerId"]]; event.initiator = this._timerEvents[event.args["data"]["timerId"]];
break; break;
case recordTypes.RequestAnimationFrame: case recordTypes.RequestAnimationFrame:
this._requestAnimationFrameEvents[event.args.data["id"]] = event; this._requestAnimationFrameEvents[event.args["data"]["id"]] = event;
break; break;
case recordTypes.FireAnimationFrame: case recordTypes.FireAnimationFrame:
event.initiator = this._requestAnimationFrameEvents[event.args.data["id"]]; event.initiator = this._requestAnimationFrameEvents[event.args["data"]["id"]];
break; break;
case recordTypes.ScheduleStyleRecalculation: case recordTypes.ScheduleStyleRecalculation:
this._lastScheduleStyleRecalculation[event.args.frame] = event; this._lastScheduleStyleRecalculation[event.args["frame"]] = event;
break; break;
case recordTypes.RecalculateStyles: case recordTypes.RecalculateStyles:
event.initiator = this._lastScheduleStyleRecalculation[event.args.frame]; event.initiator = this._lastScheduleStyleRecalculation[event.args["frame"]];
this._lastRecalculateStylesEvent = event; this._lastRecalculateStylesEvent = event;
break; break;
...@@ -487,7 +487,7 @@ WebInspector.TracingTimelineModel.prototype = { ...@@ -487,7 +487,7 @@ WebInspector.TracingTimelineModel.prototype = {
// Consider style recalculation as a reason for layout invalidation, // Consider style recalculation as a reason for layout invalidation,
// but only if we had no earlier layout invalidation records. // but only if we had no earlier layout invalidation records.
var layoutInitator = event; var layoutInitator = event;
var frameId = event.args.frame; var frameId = event.args["frame"];
if (!this._layoutInvalidate[frameId] && this._lastRecalculateStylesEvent && this._lastRecalculateStylesEvent.endTime > event.startTime) if (!this._layoutInvalidate[frameId] && this._lastRecalculateStylesEvent && this._lastRecalculateStylesEvent.endTime > event.startTime)
layoutInitator = this._lastRecalculateStylesEvent.initiator; layoutInitator = this._lastRecalculateStylesEvent.initiator;
this._layoutInvalidate[frameId] = layoutInitator; this._layoutInvalidate[frameId] = layoutInitator;
...@@ -504,13 +504,13 @@ WebInspector.TracingTimelineModel.prototype = { ...@@ -504,13 +504,13 @@ WebInspector.TracingTimelineModel.prototype = {
break; break;
case recordTypes.WebSocketCreate: case recordTypes.WebSocketCreate:
this._webSocketCreateEvents[event.args.data["identifier"]] = event; this._webSocketCreateEvents[event.args["data"]["identifier"]] = event;
break; break;
case recordTypes.WebSocketSendHandshakeRequest: case recordTypes.WebSocketSendHandshakeRequest:
case recordTypes.WebSocketReceiveHandshakeResponse: case recordTypes.WebSocketReceiveHandshakeResponse:
case recordTypes.WebSocketDestroy: case recordTypes.WebSocketDestroy:
event.initiator = this._webSocketCreateEvents[event.args.data["identifier"]]; event.initiator = this._webSocketCreateEvents[event.args["data"]["identifier"]];
break; break;
case recordTypes.EvaluateScript: case recordTypes.EvaluateScript:
...@@ -771,7 +771,7 @@ WebInspector.TracingTimelineModel.TraceEventRecord.prototype = { ...@@ -771,7 +771,7 @@ WebInspector.TracingTimelineModel.TraceEventRecord.prototype = {
*/ */
data: function() data: function()
{ {
return this._event.args.data; return this._event.args["data"];
}, },
/** /**
...@@ -795,7 +795,7 @@ WebInspector.TracingTimelineModel.TraceEventRecord.prototype = { ...@@ -795,7 +795,7 @@ WebInspector.TracingTimelineModel.TraceEventRecord.prototype = {
case WebInspector.TracingTimelineModel.RecordType.Layout: case WebInspector.TracingTimelineModel.RecordType.Layout:
return this._event.args["beginData"]["frameId"]; return this._event.args["beginData"]["frameId"];
default: default:
var data = this._event.args.data; var data = this._event.args["data"];
return (data && data["frame"]) || ""; return (data && data["frame"]) || "";
} }
}, },
......
...@@ -23,7 +23,6 @@ importScript("TimelineUIUtilsImpl.js"); ...@@ -23,7 +23,6 @@ importScript("TimelineUIUtilsImpl.js");
importScript("TimelineView.js"); importScript("TimelineView.js");
importScript("TimelineLayersView.js"); importScript("TimelineLayersView.js");
importScript("TimelinePaintProfilerView.js"); importScript("TimelinePaintProfilerView.js");
importScript("TracingModel.js");
importScript("TracingTimelineUIUtils.js"); importScript("TracingTimelineUIUtils.js");
importScript("TransformController.js"); importScript("TransformController.js");
importScript("PaintProfilerView.js"); importScript("PaintProfilerView.js");
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
"TimelineView.js", "TimelineView.js",
"TimelineLayersView.js", "TimelineLayersView.js",
"TimelinePaintProfilerView.js", "TimelinePaintProfilerView.js",
"TracingModel.js",
"TracingTimelineUIUtils.js", "TracingTimelineUIUtils.js",
"TransformController.js", "TransformController.js",
"PaintProfilerView.js", "PaintProfilerView.js",
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
"sdk/OverridesSupport.js", "sdk/OverridesSupport.js",
"sdk/PowerProfiler.js", "sdk/PowerProfiler.js",
"sdk/PresentationConsoleMessageHelper.js", "sdk/PresentationConsoleMessageHelper.js",
"sdk/TracingModel.js",
"sdk/WorkerManager.js", "sdk/WorkerManager.js",
"sdk/WorkerTargetManager.js", "sdk/WorkerTargetManager.js",
"sdk/RuntimeModel.js", "sdk/RuntimeModel.js",
...@@ -331,7 +332,6 @@ ...@@ -331,7 +332,6 @@
"timeline/TimelineView.js", "timeline/TimelineView.js",
"timeline/TimelinePaintProfilerView.js", "timeline/TimelinePaintProfilerView.js",
"timeline/TimelineLayersView.js", "timeline/TimelineLayersView.js",
"timeline/TracingModel.js",
"timeline/TracingTimelineUIUtils.js", "timeline/TracingTimelineUIUtils.js",
"timeline/TransformController.js" "timeline/TransformController.js"
] ]
......
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