Attachment 360362 Details for Bug 193918 – ROLLOUT of r240351

[patch] ROLLOUT of r240351

bug-193918-20190128121548.patch (text/plain), 4.26 KB, created by WebKit Commit Bot on 2019-01-28 12:15:48 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-01-28 12:15:48 PST

Size: 4.26 KB

patch

obsolete

>Subversion Revision: 240597
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index cf161ea9e9ff975e0491736d5922879d7e70bdf0..3cb28d4a97d15fdeb10637ab577e8b458b645ae5 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-01-28  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r240351.
>+        https://bugs.webkit.org/show_bug.cgi?id=193918
>+
>+        Causes overlapping Timeline records, as some record types
>+        don't have an endTime (Requested by drousso on #webkit).
>+
>+        Reverted changeset:
>+
>+        "WebInspector: Confusingly nested events in the timeline for
>+        Mutation Observers"
>+        https://bugs.webkit.org/show_bug.cgi?id=192884
>+        https://trac.webkit.org/changeset/240351
>+
> 2019-01-28  Matt Baker  <mattbaker@apple.com>
> 
>         REGRESSION(?): Web Inspector: Can have multiple Timelines selected after edit mode
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js b/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js
>index 259205ee394c0a122f316a9830a5a863e57dde76..20b7854d5fa2ccc5db5e28bc8c1456c92558442b 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js
>@@ -359,28 +359,6 @@ WI.TimelineManager = class TimelineManager extends WI.Object
>         if (!this._isCapturing)
>             return;
> 
>-        function fixMicrotaskPlacement(children)
>-        {
>-            let newChildren = [];
>-            for (let child of children) {
>-                if (child.type === TimelineAgent.EventType.EvaluateScript) {
>-                    let [microtasks, events] = child.children.partition((grandchild) => {
>-                        return grandchild.type === TimelineAgent.EventType.ObserverCallback;
>-                    });
>-
>-                    if (events.length) {
>-                        child.children = events;
>-                        child.endTime = events.lastValue.endTime;
>-                        newChildren.push(child);
>-                    }
>-
>-                    newChildren = newChildren.concat(microtasks);
>-                } else
>-                    newChildren.push(child);
>-            }
>-            return newChildren;
>-        }
>-
>         var records = [];
> 
>         // Iterate over the records tree using a stack. Doing this recursively has
>@@ -401,7 +379,7 @@ WI.TimelineManager = class TimelineManager extends WI.Object
>                 }
> 
>                 if (recordPayload.children && recordPayload.children.length)
>-                    stack.push({array: fixMicrotaskPlacement(recordPayload.children), parent: recordPayload, parentRecord: record || entry.parentRecord, index: 0});
>+                    stack.push({array: recordPayload.children, parent: recordPayload, parentRecord: record || entry.parentRecord, index: 0});
>                 ++entry.index;
>             } else
>                 stack.pop();
>@@ -1102,23 +1080,15 @@ WI.TimelineManager = class TimelineManager extends WI.Object
>                 webRecord.profilePayload = profilerRecord.profilePayload;
>                 profilerRecord = nextScriptProfilerRecord();
> 
>-                let firstProfilerRecordForWebRecord = null;
>-
>                 // If there are more script profile records in the same time interval, add them
>                 // as individual script evaluated records with profiles. This can happen with
>                 // web microtask checkpoints that are technically inside of other web records.
>                 // FIXME: <https://webkit.org/b/152903> Web Inspector: Timeline Cleanup: Better Timeline Record for Microtask Checkpoints
>                 while (profilerRecord && recordEnclosesRecord(webRecord, profilerRecord)) {
>-                    if (!firstProfilerRecordForWebRecord)
>-                        firstProfilerRecordForWebRecord = profilerRecord;
>-
>                     this._addRecord(profilerRecord);
>                     profilerRecord = nextScriptProfilerRecord();
>                 }
> 
>-                if (firstProfilerRecordForWebRecord)
>-                    webRecord.endTime = firstProfilerRecordForWebRecord.startTime;
>-
>                 webRecord = nextWebTimelineRecord();
>                 continue;
>             }

Actions: View | Formatted Diff | Diff

Attachments on bug 193918: 360362