Attachment 357471 Details for Bug 192773 – Patch

[patch] Patch

bug-192773-20181217133044.patch (text/plain), 2.59 KB, created by Devin Rousso on 2018-12-17 13:30:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2018-12-17 13:30:45 PST

Size: 2.59 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 9152ad45a76b7b16c7970000dfa89f9f834c0cdf..951b0225d2cfedf7fc89622e5601a85e7e74c969 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-12-17  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: REGRESSION (r237195): Timelines: selecting a rendering frame row moves the time selection
>+        https://bugs.webkit.org/show_bug.cgi?id=192773
>+        <rdar://problem/46782446>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/TimelineOverview.js:
>+        (WI.TimelineOverview.prototype._recordSelected):
>+        The Frames timeline uses `frameIndex` instead of `startTime`/`endTime`, so when trying to
>+        ensure that the selected record is within the filtered range, use `frameIndex` instead.
>+        The associated `WI.TimelineRuler` will already be using an index-based approach for
>+        selection, so this will match.
>+
> 2018-12-15  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: Styles: toggling selected properties may cause data corruption
>diff --git a/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js b/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js
>index bb0dbe5735805d4149a16be8e7e4afaf1445a3c9..f685c54b94eb588502fe5eafed4a61157f666609 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js
>@@ -733,10 +733,13 @@ WI.TimelineOverview = class TimelineOverview extends WI.View
>                 lastRecord = recordBar.records.lastValue;
>             }
> 
>-            if (firstRecord.startTime < this.selectionStartTime || lastRecord.endTime > this.selectionStartTime + this.selectionDuration) {
>+            let startTime = firstRecord instanceof WI.RenderingFrameTimelineRecord ? firstRecord.frameIndex : firstRecord.startTime;
>+            let endTime = lastRecord instanceof WI.RenderingFrameTimelineRecord ? lastRecord.frameIndex : lastRecord.startTime;
>+
>+            if (startTime < this.selectionStartTime || endTime > this.selectionStartTime + this.selectionDuration) {
>                 let selectionPadding = this.secondsPerPixel * 10;
>-                this.selectionStartTime = firstRecord.startTime - selectionPadding;
>-                this.selectionDuration = lastRecord.endTime - firstRecord.startTime + (selectionPadding * 2);
>+                this.selectionStartTime = startTime - selectionPadding;
>+                this.selectionDuration = endTime - startTime + (selectionPadding * 2);
>             }
>         }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192773: 357471