Title: [278744] branches/safari-612.1.18-branch/Source/WebKit
- Revision
- 278744
- Author
- rubent...@apple.com
- Date
- 2021-06-10 17:31:29 -0700 (Thu, 10 Jun 2021)
Log Message
Cherry-pick r278741. rdar://problem/79169276
Regression(r278449): add null check for completionHandler in WebIDBServer::close
https://bugs.webkit.org/show_bug.cgi?id=226900
rdar://79160392
Reviewed by Chris Dumez.
* NetworkProcess/IndexedDB/WebIDBServer.cpp:
(WebKit::WebIDBServer::close):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278741 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.18-branch/Source/WebKit/ChangeLog (278743 => 278744)
--- branches/safari-612.1.18-branch/Source/WebKit/ChangeLog 2021-06-11 00:28:19 UTC (rev 278743)
+++ branches/safari-612.1.18-branch/Source/WebKit/ChangeLog 2021-06-11 00:31:29 UTC (rev 278744)
@@ -1,5 +1,32 @@
2021-06-10 Russell Epstein <repst...@apple.com>
+ Cherry-pick r278741. rdar://problem/79169276
+
+ Regression(r278449): add null check for completionHandler in WebIDBServer::close
+ https://bugs.webkit.org/show_bug.cgi?id=226900
+ rdar://79160392
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/IndexedDB/WebIDBServer.cpp:
+ (WebKit::WebIDBServer::close):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278741 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-06-10 Sihui Liu <sihui_...@apple.com>
+
+ Regression(r278449): add null check for completionHandler in WebIDBServer::close
+ https://bugs.webkit.org/show_bug.cgi?id=226900
+ rdar://79160392
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/IndexedDB/WebIDBServer.cpp:
+ (WebKit::WebIDBServer::close):
+
+2021-06-10 Russell Epstein <repst...@apple.com>
+
Cherry-pick r278727. rdar://problem/79161529
REGRESSION (r277820): Trackpad interaction in Web Content is not working on iOS or macCatalyst
Modified: branches/safari-612.1.18-branch/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp (278743 => 278744)
--- branches/safari-612.1.18-branch/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp 2021-06-11 00:28:19 UTC (rev 278743)
+++ branches/safari-612.1.18-branch/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp 2021-06-11 00:31:29 UTC (rev 278744)
@@ -409,7 +409,7 @@
connection.removeWorkQueueMessageReceiver(Messages::WebIDBServer::messageReceiverName());
// Dispatch last task to clean up.
- postTask([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
+ postTask([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
m_connectionMap.clear();
{
@@ -418,7 +418,8 @@
}
postTaskReply([protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler)]() mutable {
- completionHandler();
+ if (completionHandler)
+ completionHandler();
});
});
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
