Changeset 267092 in webkit

Timestamp:

Sep 15, 2020, 11:39:24 AM (6 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r267002): ASSERTION FAILED:[ iOS wk2 Debug ] !HashTranslator::equal(KeyTraits::emptyValue(), key) on compositing/ios/overflow-scroll-update-overlap.html
​https://bugs.webkit.org/show_bug.cgi?id=216520
<rdar://problem/68894931>

Reviewed by Tim Horton.

Source/WebKit:

Avoid hash lookups with zero nodeIDs.

• WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm:

(WebKit::RemoteScrollingCoordinator::isRubberBandInProgress const):
(WebKit::RemoteScrollingCoordinator::isUserScrollInProgress const):
(WebKit::RemoteScrollingCoordinator::isScrollSnapInProgress const):

LayoutTests:

• platform/ios-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-wk2/TestExpectations (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-15  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r267002): ASSERTION FAILED:[ iOS wk2 Debug ] !HashTranslator::equal(KeyTraits::emptyValue(), key) on compositing/ios/overflow-scroll-update-overlap.html
+        https://bugs.webkit.org/show_bug.cgi?id=216520
+        <rdar://problem/68894931>
+
+        Reviewed by Tim Horton.
+
+        * platform/ios-wk2/TestExpectations:
+
 2020-09-14  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -1393 +1393 @@
 webkit.org/b/208585 imported/w3c/web-platform-tests/mediacapture-streams/MediaStream-removetrack.https.html [ Pass Failure ]
 
-webkit.org/b/208587 scrollingcoordinator/ios/fixed-frame-overflow-swipe.html [ Pass ImageOnlyFailure Crash ]
+webkit.org/b/208587 scrollingcoordinator/ios/fixed-frame-overflow-swipe.html [ Pass ImageOnlyFailure ]
 
 webkit.org/b/208590 [ Debug ] fast/events/beforeunload-prompt.html [ Pass Crash ]
@@ -1891 +1891 @@
 webkit.org/b/186045 imported/w3c/web-platform-tests/css/css-ui/text-overflow-017.html [ Skip ]
 webkit.org/b/186045 imported/w3c/web-platform-tests/css/css-values/vh_not_refreshing_on_chrome.html [ Skip ]
-
-webkit.org/b/216520 [ Debug ] fast/scrolling/ios/click-events-during-momentum-scroll-in-overflow.html [ Crash ]

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-15  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r267002): ASSERTION FAILED:[ iOS wk2 Debug ] !HashTranslator::equal(KeyTraits::emptyValue(), key) on compositing/ios/overflow-scroll-update-overlap.html
+        https://bugs.webkit.org/show_bug.cgi?id=216520
+        <rdar://problem/68894931>
+
+        Reviewed by Tim Horton.
+
+        Avoid hash lookups with zero nodeIDs.
+
+        * WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm:
+        (WebKit::RemoteScrollingCoordinator::isRubberBandInProgress const):
+        (WebKit::RemoteScrollingCoordinator::isUserScrollInProgress const):
+        (WebKit::RemoteScrollingCoordinator::isScrollSnapInProgress const):
+
 2020-09-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm

@@ -75 +75 @@
 bool RemoteScrollingCoordinator::isRubberBandInProgress(ScrollingNodeID nodeID) const
 {
+    if (!nodeID)
+        return false;
     return m_nodesWithActiveRubberBanding.contains(nodeID);
 }
@@ -80 +82 @@
 bool RemoteScrollingCoordinator::isUserScrollInProgress(ScrollingNodeID nodeID) const
 {
+    if (!nodeID)
+        return false;
     return m_nodesWithActiveUserScrolls.contains(nodeID);
 }
@@ -85 +89 @@
 bool RemoteScrollingCoordinator::isScrollSnapInProgress(ScrollingNodeID nodeID) const
 {
+    if (!nodeID)
+        return false;
     return m_nodesWithActiveScrollSnap.contains(nodeID);
 }