Changeset 256903 in webkit

Timestamp:

Feb 18, 2020 8:15:11 PM (4 years ago)

Author:

Wenson Hsieh

Message:

REGRESSION (r256093): fast/events/touch/ios/block-without-overflow-scroll.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=207919
<rdar://problem/59565344>

Reviewed by Tim Horton.

Source/WebCore:

Three iOS-specific layout tests began to fail after r256093, since they currently depend on a particular
ordering when iterating over elements in a hash map. Instead of just rebaselining these tests, we can make them
more robust against similar changes in the future by forcing a deterministic order when printing out synchronous
touch event regions for testing.

I arbitrarily chose to sort the keys (which are touch event type names) in alphabetical order.

• page/scrolling/ScrollingStateFrameScrollingNode.cpp:

(WebCore::ScrollingStateFrameScrollingNode::dumpProperties const):

LayoutTests:

Rebaseline some layout tests after changing the order in which synchronous touch event regions are dumped when
calling internals.scrollingStateTreeAsText().

• fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt:
• fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt:
• fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-02-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        REGRESSION (r256093): fast/events/touch/ios/block-without-overflow-scroll.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=207919
+        <rdar://problem/59565344>
+
+        Reviewed by Tim Horton.
+
+        Rebaseline some layout tests after changing the order in which synchronous touch event regions are dumped when
+        calling internals.scrollingStateTreeAsText().
+
+        * fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt:
+        * fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt:
+        * fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt:
+
 2020-02-18  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt

@@ -16 +16 @@
   (synchronous event dispatch region for event touchend
     at (8,8) size 784x200)
-  (synchronous event dispatch region for event touchstart
-    at (8,8) size 784x200)
   (synchronous event dispatch region for event touchforcechange
     at (8,8) size 784x200)
   (synchronous event dispatch region for event touchmove
     at (8,8) size 784x200)
+  (synchronous event dispatch region for event touchstart
+    at (8,8) size 784x200)
   (behavior for fixed 0)
 )

trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt

@@ -18 +18 @@
   (synchronous event dispatch region for event touchend
     at (8,8) size 784x200)
-  (synchronous event dispatch region for event touchstart
-    at (8,8) size 784x200)
   (synchronous event dispatch region for event touchforcechange
     at (8,8) size 784x200)
   (synchronous event dispatch region for event touchmove
     at (8,8) size 784x200)
+  (synchronous event dispatch region for event touchstart
+    at (8,8) size 784x200)
   (behavior for fixed 0)
 )

trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt

@@ -16 +16 @@
   (synchronous event dispatch region for event touchend
     at (0,0) size 800x200)
-  (synchronous event dispatch region for event touchstart
-    at (0,0) size 800x200)
   (synchronous event dispatch region for event touchforcechange
     at (0,0) size 800x200)
   (synchronous event dispatch region for event touchmove
     at (0,0) size 800x200)
+  (synchronous event dispatch region for event touchstart
+    at (0,0) size 800x200)
   (behavior for fixed 0)
 )

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        REGRESSION (r256093): fast/events/touch/ios/block-without-overflow-scroll.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=207919
+        <rdar://problem/59565344>
+
+        Reviewed by Tim Horton.
+
+        Three iOS-specific layout tests began to fail after r256093, since they currently depend on a particular
+        ordering when iterating over elements in a hash map. Instead of just rebaselining these tests, we can make them
+        more robust against similar changes in the future by forcing a deterministic order when printing out synchronous
+        touch event regions for testing.
+
+        I arbitrarily chose to sort the keys (which are touch event type names) in alphabetical order.
+
+        * page/scrolling/ScrollingStateFrameScrollingNode.cpp:
+        (WebCore::ScrollingStateFrameScrollingNode::dumpProperties const):
+
 2020-02-18  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp

@@ -339 +339 @@
     }
 
-    if (!m_eventTrackingRegions.eventSpecificSynchronousDispatchRegions.isEmpty()) {
-        for (const auto& synchronousEventRegion : m_eventTrackingRegions.eventSpecificSynchronousDispatchRegions) {
+    auto& synchronousDispatchRegionMap = m_eventTrackingRegions.eventSpecificSynchronousDispatchRegions;
+    if (!synchronousDispatchRegionMap.isEmpty()) {
+        auto eventRegionNames = copyToVector(synchronousDispatchRegionMap.keys());
+        std::sort(eventRegionNames.begin(), eventRegionNames.end(), WTF::codePointCompareLessThan);
+        for (const auto& name : eventRegionNames) {
+            const auto& region = synchronousDispatchRegionMap.get(name);
             TextStream::GroupScope scope(ts);
-            ts << "synchronous event dispatch region for event " << synchronousEventRegion.key;
-            for (auto rect : synchronousEventRegion.value.rects()) {
+            ts << "synchronous event dispatch region for event " << name;
+            for (auto rect : region.rects()) {
                 ts << "\n";
                 ts << indent << rect;