Title: [267674] branches/safari-610-branch
- Revision
- 267674
- Author
- [email protected]
- Date
- 2020-09-27 13:00:18 -0700 (Sun, 27 Sep 2020)
Log 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
Modified Paths
Diff
Modified: branches/safari-610-branch/LayoutTests/ChangeLog (267673 => 267674)
--- branches/safari-610-branch/LayoutTests/ChangeLog 2020-09-27 20:00:14 UTC (rev 267673)
+++ branches/safari-610-branch/LayoutTests/ChangeLog 2020-09-27 20:00:18 UTC (rev 267674)
@@ -1,5 +1,40 @@
2020-09-27 Alan Coon <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r266611. rdar://problem/69594191
MediaRecorder timeslice parameter causing internal error on longer videos
Modified: branches/safari-610-branch/LayoutTests/platform/ios-wk2/TestExpectations (267673 => 267674)
--- branches/safari-610-branch/LayoutTests/platform/ios-wk2/TestExpectations 2020-09-27 20:00:14 UTC (rev 267673)
+++ branches/safari-610-branch/LayoutTests/platform/ios-wk2/TestExpectations 2020-09-27 20:00:18 UTC (rev 267674)
@@ -1873,3 +1873,6 @@
#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 ]
Modified: branches/safari-610-branch/Source/WebKit/ChangeLog (267673 => 267674)
--- branches/safari-610-branch/Source/WebKit/ChangeLog 2020-09-27 20:00:14 UTC (rev 267673)
+++ branches/safari-610-branch/Source/WebKit/ChangeLog 2020-09-27 20:00:18 UTC (rev 267674)
@@ -1,5 +1,45 @@
2020-09-27 Alan Coon <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r267002. rdar://problem/69594199
Overflow:scroll rubberbanding is interrupted by post-layout scrolling
Modified: branches/safari-610-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm (267673 => 267674)
--- branches/safari-610-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm 2020-09-27 20:00:14 UTC (rev 267673)
+++ branches/safari-610-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm 2020-09-27 20:00:18 UTC (rev 267674)
@@ -74,16 +74,22 @@
bool RemoteScrollingCoordinator::isRubberBandInProgress(ScrollingNodeID nodeID) const
{
+ if (!nodeID)
+ return false;
return m_nodesWithActiveRubberBanding.contains(nodeID);
}
bool RemoteScrollingCoordinator::isUserScrollInProgress(ScrollingNodeID nodeID) const
{
+ if (!nodeID)
+ return false;
return m_nodesWithActiveUserScrolls.contains(nodeID);
}
bool RemoteScrollingCoordinator::isScrollSnapInProgress(ScrollingNodeID nodeID) const
{
+ if (!nodeID)
+ return false;
return m_nodesWithActiveScrollSnap.contains(nodeID);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
