Changeset 140123 in webkit

Timestamp:

Jan 18, 2013 4:15:29 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Timeline: nest time/timeEnd records when possible (in glue-mode)
​https://bugs.webkit.org/show_bug.cgi?id=100114

Patch by Eugene Klyuchnikov <​eustas.bug@gmail.com> on 2013-01-18
Reviewed by Pavel Feldman.

Source/WebCore:

Nesting time/timeEnd intervals will provide a better overview on
what is happening.

• inspector/front-end/TimelinePresentationModel.js: Added logic that

reparents "time" record when "timeEnd" arrives.

LayoutTests:

Changed test to adopt new gluing rules.

• inspector/timeline/timeline-time.html: Updated test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/timeline/timeline-time.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/TimelinePresentationModel.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-18  Eugene Klyuchnikov  <eustas.bug@gmail.com>
+
+        Web Inspector: Timeline: nest time/timeEnd records when possible (in glue-mode)
+        https://bugs.webkit.org/show_bug.cgi?id=100114
+
+        Reviewed by Pavel Feldman.
+
+        Changed test to adopt new gluing rules.
+
+        * inspector/timeline/timeline-time.html: Updated test.
+
 2013-01-18  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/LayoutTests/inspector/timeline/timeline-time.html

@@ -49 +49 @@
     {
         var root = presentationModel.rootRecord();
-        InspectorTest.assertEquals(5, root.children.length);
+        InspectorTest.assertEquals(4, root.children.length);
 
         var time1 = root.children[1];
         InspectorTest.assertEquals("Time", time1.type);
-        InspectorTest.assertEquals(1, time1.children.length);
-        var timeEnd1 = time1.children[0];
+        InspectorTest.assertEquals(2, time1.children.length);
+        var timeEnd1 = time1.children[1];
         InspectorTest.assertEquals("TimeEnd", timeEnd1.type);
         InspectorTest.assertEquals(time1, timeEnd1.timeRecord);
         InspectorTest.assertEquals(timeEnd1, time1.timeEndRecord);
 
-        var time2 = root.children[3];
+        var time2 = time1.children[0];
         InspectorTest.assertEquals("Time", time2.type);
         InspectorTest.assertEquals(1, time2.children.length);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-18  Eugene Klyuchnikov  <eustas.bug@gmail.com>
+
+        Web Inspector: Timeline: nest time/timeEnd records when possible (in glue-mode)
+        https://bugs.webkit.org/show_bug.cgi?id=100114
+
+        Reviewed by Pavel Feldman.
+
+        Nesting time/timeEnd intervals will provide a better overview on
+        what is happening.
+
+        * inspector/front-end/TimelinePresentationModel.js: Added logic that
+        reparents "time" record when "timeEnd" arrives.
+
 2013-01-18  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js

@@ -263 +263 @@
         this._requestAnimationFrameRecords = {};
         this._timeRecords = {};
+        this._timeRecordStack = [];
         this._frames = [];
         this._minimumRecordTime = -1;
@@ -586 +587 @@
 
     case recordTypes.Time:
-        presentationModel._timeRecords[record.data["message"]] = this;
+        var message = record.data["message"];
+        var oldReference = presentationModel._timeRecords[message];
+        if (oldReference)
+            break;
+        presentationModel._timeRecords[message] = this;
+        if (origin)
+            presentationModel._timeRecordStack.push(this);
         break;
 
@@ -599 +606 @@
             this.intervalDuration = intervalDuration;
             timeRecord.intervalDuration = intervalDuration;
+            if (!origin)
+                break;
+            var recordStack = presentationModel._timeRecordStack;
+            recordStack.splice(recordStack.indexOf(timeRecord), 1);
+            for (var index = recordStack.length; index; --index) {
+                var openRecord = recordStack[index - 1];
+                if (openRecord.startTime > timeRecord.startTime)
+                    continue;
+                function compareStartTime(value, record)
+                {
+                    return value < record.startTime ? -1 : 1;
+                }
+                timeRecord.parent.children.splice(timeRecord.parent.children.indexOf(timeRecord));
+                openRecord.children.splice(insertionIndexForObjectInListSortedByFunction(timeRecord.startTime, openRecord.children, compareStartTime), 0, timeRecord);
+                break;
+            }
         }
         break;