Changeset 192560 in webkit

Timestamp:

Nov 17, 2015, 5:34:49 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Move Timeline creation into a recording
​https://bugs.webkit.org/show_bug.cgi?id=151367

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-11-17
Reviewed by Timothy Hatcher.

• UserInterface/Controllers/TimelineManager.js:

(WebInspector.TimelineManager.prototype._loadNewRecording): Deleted.

• UserInterface/Models/Timeline.js:

(WebInspector.Timeline.create):
(WebInspector.Timeline.prototype.get type):
(WebInspector.Timeline): Deleted.
(WebInspector.Timeline.prototype.get recording): Deleted.

• UserInterface/Models/TimelineRecording.js:

(WebInspector.TimelineRecording):
(WebInspector.TimelineRecording.prototype.get readonly):
(WebInspector.TimelineRecording.prototype.unloaded):
(WebInspector.TimelineRecording.prototype.reset):
(WebInspector.TimelineRecording.prototype.isWritable): Deleted.

• UserInterface/Views/TimelineOverview.js:

(WebInspector.TimelineOverview):

• UserInterface/Views/TimelineRecordingContentView.js:

(WebInspector.TimelineRecordingContentView.prototype.shown):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/TimelineManager.js (modified) (1 diff)
• UserInterface/Models/Timeline.js (modified) (3 diffs)
• UserInterface/Models/TimelineRecording.js (modified) (5 diffs)
• UserInterface/Views/TimelineOverview.js (modified) (1 diff)
• UserInterface/Views/TimelineRecordingContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-11-17  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Move Timeline creation into a recording
+        https://bugs.webkit.org/show_bug.cgi?id=151367
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Controllers/TimelineManager.js:
+        (WebInspector.TimelineManager.prototype._loadNewRecording): Deleted.
+        * UserInterface/Models/Timeline.js:
+        (WebInspector.Timeline.create):
+        (WebInspector.Timeline.prototype.get type):
+        (WebInspector.Timeline): Deleted.
+        (WebInspector.Timeline.prototype.get recording): Deleted.
+        * UserInterface/Models/TimelineRecording.js:
+        (WebInspector.TimelineRecording):
+        (WebInspector.TimelineRecording.prototype.get readonly):
+        (WebInspector.TimelineRecording.prototype.unloaded):
+        (WebInspector.TimelineRecording.prototype.reset):
+        (WebInspector.TimelineRecording.prototype.isWritable): Deleted.
+        * UserInterface/Views/TimelineOverview.js:
+        (WebInspector.TimelineOverview):
+        * UserInterface/Views/TimelineRecordingContentView.js:
+        (WebInspector.TimelineRecordingContentView.prototype.shown):
+
 2015-11-17  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js

@@ -448 +448 @@
         var identifier = this._nextRecordingIdentifier++;
         var newRecording = new WebInspector.TimelineRecording(identifier, WebInspector.UIString("Timeline Recording %d").format(identifier));
-        newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Network, newRecording));
-        newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Layout, newRecording));
-        newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Script, newRecording));
-
-        // COMPATIBILITY (iOS 8): TimelineAgent.EventType.RenderingFrame did not exist.
-        if (window.TimelineAgent && TimelineAgent.EventType.RenderingFrame)
-            newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.RenderingFrame, newRecording));
 
         this._recordings.push(newRecording);
         this.dispatchEventToListeners(WebInspector.TimelineManager.Event.RecordingCreated, {recording: newRecording});
-
-        console.assert(newRecording.isWritable());
 
         if (this._isCapturing)

trunk/Source/WebInspectorUI/UserInterface/Models/Timeline.js

@@ -26 +26 @@
 WebInspector.Timeline = class Timeline extends WebInspector.Object
 {
-    constructor(type, recording)
+    constructor(type)
     {
         super();
 
         this._type = type;
-        this._recording = recording;
 
         this.reset(true);
@@ -38 +37 @@
     // Static
 
-    static create(type, recording)
+    static create(type)
     {
         if (type === WebInspector.TimelineRecord.Type.Network)
-            return new WebInspector.NetworkTimeline(type, recording);
+            return new WebInspector.NetworkTimeline(type);
 
-        return new WebInspector.Timeline(type, recording);
+        return new WebInspector.Timeline(type);
     }
 
     // Public
+
+    get type()
+    {
+        return this._type;
+    }
 
     get startTime()
@@ -61 +65 @@
     {
         return this._records;
-    }
-
-    get type()
-    {
-        return this._type;
-    }
-
-    get recording()
-    {
-        return this._recording;
     }
 

trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js

@@ -33 +33 @@
         this._timelines = new Map;
         this._displayName = displayName;
-        this._isWritable = true;
+        this._readonly = false;
+
+        this.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Network));
+        this.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Layout));
+        this.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Script));
+
+        // COMPATIBILITY (iOS 8): TimelineAgent.EventType.RenderingFrame did not exist.
+        if (window.TimelineAgent && TimelineAgent.EventType.RenderingFrame)
+            this.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.RenderingFrame));
 
         // For legacy backends, we compute the elapsed time of records relative to this timestamp.
@@ -58 +66 @@
     }
 
+    get readonly()
+    {
+        return this._readonly;
+    }
+
     get startTime()
     {
@@ -72 +85 @@
         // Do nothing. Timeline recordings are not persisted when the inspector is
         // re-opened, so do not attempt to restore by identifier or display name.
-    }
-
-    isWritable()
-    {
-        return this._isWritable;
     }
 
@@ -93 +101 @@
         console.assert(!this.isEmpty(), "Shouldn't unload an empty recording; it should be reused instead.");
 
-        this._isWritable = false;
+        this._readonly = true;
 
         this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.Unloaded);
@@ -100 +108 @@
     reset(suppressEvents)
     {
-        console.assert(this._isWritable, "Can't reset a read-only recording.");
+        console.assert(!this._readonly, "Can't reset a read-only recording.");
 
         this._sourceCodeTimelinesMap = new Map;

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js

@@ -30 +30 @@
         super();
 
+        console.assert(timelineRecording instanceof WebInspector.TimelineRecording);
+
         this._recording = timelineRecording;
         this._recording.addEventListener(WebInspector.TimelineRecording.Event.TimelineAdded, this._timelineAdded, this);

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js

@@ -165 +165 @@
         this._currentTimelineOverview.shown();
         this._contentViewContainer.shown();
-        this._clearTimelineNavigationItem.enabled = this._recording.isWritable();
+        this._clearTimelineNavigationItem.enabled = !this._recording.readonly;
 
         this._currentContentViewDidChange();