Title: [228169] branches/safari-605-branch/Source/WebCore
- Revision
- 228169
- Author
- jmarc...@apple.com
- Date
- 2018-02-06 07:16:42 -0800 (Tue, 06 Feb 2018)
Log Message
Cherry-pick r228143. rdar://problem/37264459
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (228168 => 228169)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-06 15:16:39 UTC (rev 228168)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-06 15:16:42 UTC (rev 228169)
@@ -1,5 +1,26 @@
2018-02-06 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r228143. rdar://problem/37264459
+
+ 2018-02-05 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Release assert failed under NetworkStateNotifier::singleton.
+ https://bugs.webkit.org/show_bug.cgi?id=182516
+
+ Reviewed by Brent Fulgham.
+
+ The callback NetworkStateNotifier::addressChangeCallback will always be called on a
+ worker thread on Windows. Since the method NetworkStateNotifier::singleton() is
+ called by NetworkStateNotifier::addressChangeCallback, but has to be called on the
+ on the main thread, the call has to be moved there.
+
+ No new tests. I have not been able to reproduce the crash.
+
+ * platform/network/win/NetworkStateNotifierWin.cpp:
+ (WebCore::NetworkStateNotifier::addressChangeCallback):
+
+2018-02-06 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r228119. rdar://problem/37264495
2018-02-05 John Wilander <wilan...@apple.com>
Modified: branches/safari-605-branch/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp (228168 => 228169)
--- branches/safari-605-branch/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp 2018-02-06 15:16:39 UTC (rev 228168)
+++ branches/safari-605-branch/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp 2018-02-06 15:16:42 UTC (rev 228169)
@@ -58,11 +58,11 @@
void CALLBACK NetworkStateNotifier::addressChangeCallback(void*, BOOLEAN timedOut)
{
- // NotifyAddrChange only notifies us of a single address change. Now that we've been notified,
- // we need to call it again so we'll get notified the *next* time.
- singleton().registerForAddressChange();
+ callOnMainThread([] {
+ // NotifyAddrChange only notifies us of a single address change. Now that we've been notified,
+ // we need to call it again so we'll get notified the *next* time.
+ singleton().registerForAddressChange();
- callOnMainThread([] {
singleton().updateStateSoon();
});
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
