Changeset 267674 in webkit

Timestamp:

Sep 27, 2020, 1:00:18 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r267092. rdar://problem/69594199

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:

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@267092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch

Files:

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

branches/safari-610-branch/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-27  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r267092. rdar://problem/69594199
+
+    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:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267092 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-610-branch/LayoutTests/platform/ios-wk2/TestExpectations

@@ -1874 +1874 @@
 #rdar://69407691 REGRESSION: [ iOS wk2 ] http/wpt/cache-storage/quota-third-party.https.html is a flaky failure
 http/wpt/cache-storage/quota-third-party.https.html [ Pass Failure ]
+
+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 ]

branches/safari-610-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-27  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r267092. rdar://problem/69594199
+
+    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:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267092 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-610-branch/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);
 }