Title: [256539] branches/safari-610.1.3-branch
- Revision
- 256539
- Author
- [email protected]
- Date
- 2020-02-13 13:49:48 -0800 (Thu, 13 Feb 2020)
Log Message
Cherry-pick r256317. rdar://problem/59398474
REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
https://bugs.webkit.org/show_bug.cgi?id=207521
<rdar://problem/59331313>
Reviewed by Eric Carlson.
Source/WebKit:
Covered by debug assertion not hit in layout tests.
* WebProcess/Network/webrtc/WebMDNSRegister.cpp:
(WebKit::WebMDNSRegister::finishedRegisteringMDNSName):
Call completion handler even if the document entry has been cleared, which can happen in suspend/destruction case.
If the entry is not there, all MDNS names for the document have been unregistered. We then report a registration error.
LayoutTests:
* platform/mac-wk2/TestExpectations:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.3-branch/LayoutTests/ChangeLog (256538 => 256539)
--- branches/safari-610.1.3-branch/LayoutTests/ChangeLog 2020-02-13 21:49:44 UTC (rev 256538)
+++ branches/safari-610.1.3-branch/LayoutTests/ChangeLog 2020-02-13 21:49:48 UTC (rev 256539)
@@ -1,5 +1,40 @@
2020-02-13 Alan Coon <[email protected]>
+ Cherry-pick r256317. rdar://problem/59398474
+
+ REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
+ https://bugs.webkit.org/show_bug.cgi?id=207521
+ <rdar://problem/59331313>
+
+ Reviewed by Eric Carlson.
+
+ Source/WebKit:
+
+ Covered by debug assertion not hit in layout tests.
+
+ * WebProcess/Network/webrtc/WebMDNSRegister.cpp:
+ (WebKit::WebMDNSRegister::finishedRegisteringMDNSName):
+ Call completion handler even if the document entry has been cleared, which can happen in suspend/destruction case.
+ If the entry is not there, all MDNS names for the document have been unregistered. We then report a registration error.
+
+ LayoutTests:
+
+ * platform/mac-wk2/TestExpectations:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-02-11 Youenn Fablet <[email protected]>
+
+ REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
+ https://bugs.webkit.org/show_bug.cgi?id=207521
+ <rdar://problem/59331313>
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac-wk2/TestExpectations:
+
+2020-02-13 Alan Coon <[email protected]>
+
Cherry-pick r256231. rdar://problem/59398474
Regression: (r256009?) [ Mojave wk2 Debug ] webrtc/peerconnection-page-cache-long.html is crashing.
Modified: branches/safari-610.1.3-branch/LayoutTests/platform/mac-wk2/TestExpectations (256538 => 256539)
--- branches/safari-610.1.3-branch/LayoutTests/platform/mac-wk2/TestExpectations 2020-02-13 21:49:44 UTC (rev 256538)
+++ branches/safari-610.1.3-branch/LayoutTests/platform/mac-wk2/TestExpectations 2020-02-13 21:49:48 UTC (rev 256539)
@@ -1001,4 +1001,3 @@
webkit.org/b/207385 http/tests/paymentrequest/page-cache-completed-payment-response.https.html [ Pass Failure ]
-webkit.org/b/207521 [ Mojave Debug ] webrtc/peerconnection-page-cache-long.html [ Pass Crash ]
Modified: branches/safari-610.1.3-branch/Source/WebKit/ChangeLog (256538 => 256539)
--- branches/safari-610.1.3-branch/Source/WebKit/ChangeLog 2020-02-13 21:49:44 UTC (rev 256538)
+++ branches/safari-610.1.3-branch/Source/WebKit/ChangeLog 2020-02-13 21:49:48 UTC (rev 256539)
@@ -1,3 +1,43 @@
+2020-02-13 Alan Coon <[email protected]>
+
+ Cherry-pick r256317. rdar://problem/59398474
+
+ REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
+ https://bugs.webkit.org/show_bug.cgi?id=207521
+ <rdar://problem/59331313>
+
+ Reviewed by Eric Carlson.
+
+ Source/WebKit:
+
+ Covered by debug assertion not hit in layout tests.
+
+ * WebProcess/Network/webrtc/WebMDNSRegister.cpp:
+ (WebKit::WebMDNSRegister::finishedRegisteringMDNSName):
+ Call completion handler even if the document entry has been cleared, which can happen in suspend/destruction case.
+ If the entry is not there, all MDNS names for the document have been unregistered. We then report a registration error.
+
+ LayoutTests:
+
+ * platform/mac-wk2/TestExpectations:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-02-11 Youenn Fablet <[email protected]>
+
+ REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
+ https://bugs.webkit.org/show_bug.cgi?id=207521
+ <rdar://problem/59331313>
+
+ Reviewed by Eric Carlson.
+
+ Covered by debug assertion not hit in layout tests.
+
+ * WebProcess/Network/webrtc/WebMDNSRegister.cpp:
+ (WebKit::WebMDNSRegister::finishedRegisteringMDNSName):
+ Call completion handler even if the document entry has been cleared, which can happen in suspend/destruction case.
+ If the entry is not there, all MDNS names for the document have been unregistered. We then report a registration error.
+
2020-02-12 Alan Coon <[email protected]>
Cherry-pick r256396. rdar://problem/59398237
Modified: branches/safari-610.1.3-branch/Source/WebKit/WebProcess/Network/webrtc/WebMDNSRegister.cpp (256538 => 256539)
--- branches/safari-610.1.3-branch/Source/WebKit/WebProcess/Network/webrtc/WebMDNSRegister.cpp 2020-02-13 21:49:44 UTC (rev 256538)
+++ branches/safari-610.1.3-branch/Source/WebKit/WebProcess/Network/webrtc/WebMDNSRegister.cpp 2020-02-13 21:49:48 UTC (rev 256539)
@@ -44,8 +44,10 @@
if (result.has_value()) {
auto iterator = m_registeringDocuments.find(pendingRegistration.documentIdentifier);
- if (iterator == m_registeringDocuments.end())
+ if (iterator == m_registeringDocuments.end()) {
+ pendingRegistration.callback(makeUnexpected(WebCore::MDNSRegisterError::DNSSD));
return;
+ }
iterator->value.add(pendingRegistration.ipAddress, result.value());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
