Changeset 193016 in webkit

Timestamp:

Dec 3, 2015, 10:31:33 AM (10 years ago)

Author:

timothy@apple.com

Message:

Merge r187207. rdar://problem/23221163

Location:

branches/safari-601-branch/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/TimelineRuler.js (modified) (6 diffs)

branches/safari-601-branch/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-12-01  Timothy Hatcher  <timothy@apple.com>
+
+        Merge r187207. rdar://problem/23221163
+
+    2015-07-22  Matt Baker  <mattbaker@apple.com>
+
+            Web Inspector: TimelineRuler shouldn't dispatch selection changed event unless it actually changes
+            https://bugs.webkit.org/show_bug.cgi?id=147219
+
+            Reviewed by Timothy Hatcher.
+
+            Moved to a "suppress next" model for suppressing dispatch of TimelineRuler's selection changed event. The
+            ruler's _timeRangeSelectionChanged flag is now reset only when an event is finally dispatched.
+
+            * UserInterface/Views/TimelineRuler.js:
+            (WebInspector.TimelineRuler):
+            (WebInspector.TimelineRuler.prototype._updateSelection):
+            (WebInspector.TimelineRuler.prototype._dispatchTimeRangeSelectionChangedEvent):
+            Check for this._timeRangeSelectionChanged moved into dispatch function.
+            (WebInspector.TimelineRuler.prototype._handleMouseDown):
+            (WebInspector.TimelineRuler.prototype._handleMouseMove):
+            (WebInspector.TimelineRuler.prototype._handleMouseUp):
+            We now suppress the next dispatch only, rather than a toggle.
+
 2015-12-01  Timothy Hatcher  <timothy@apple.com>
 

branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js

@@ -52 +52 @@
     this._minimumSelectionDuration = 0.01;
     this._formatLabelCallback = null;
+    this._suppressNextTimeRangeSelectionChangedEvent = false;
+    this._timeRangeSelectionChanged = false;
 
     this._markerElementMap = new Map;
@@ -617 +619 @@
         }
 
-        if (this._timeRangeSelectionChanged)
-            this._dispatchTimeRangeSelectionChangedEvent();
+        this._dispatchTimeRangeSelectionChangedEvent();
     },
 
@@ -639 +640 @@
     _dispatchTimeRangeSelectionChangedEvent: function()
     {
-        delete this._timeRangeSelectionChanged;
-
-        if (this._suppressTimeRangeSelectionChangedEvent)
-            return;
+        if (!this._timeRangeSelectionChanged)
+            return;
+
+        if (this._suppressNextTimeRangeSelectionChangedEvent) {
+            this._suppressNextTimeRangeSelectionChangedEvent = false;
+            return;
+        }
+
+        this._timeRangeSelectionChanged = false;
 
         this.dispatchEventToListeners(WebInspector.TimelineRuler.Event.TimeRangeSelectionChanged);
@@ -659 +665 @@
 
         this._selectionIsMove = event.target === this._selectionDragElement;
-        this._suppressTimeRangeSelectionChangedEvent = !this._selectionIsMove;
         this._rulerBoundingClientRect = this._element.getBoundingClientRect();
 
@@ -684 +689 @@
     {
         console.assert(event.button === 0);
+
+        this._suppressNextTimeRangeSelectionChangedEvent = !this._selectionIsMove;
 
         if (this._selectionIsMove) {
@@ -736 +743 @@
             }
         }
-
-        delete this._suppressTimeRangeSelectionChangedEvent;
 
         this._dispatchTimeRangeSelectionChangedEvent();