Title: [254772] trunk/Source/WebCore
- Revision
- 254772
- Author
- [email protected]
- Date
- 2020-01-17 15:57:35 -0800 (Fri, 17 Jan 2020)
Log Message
Don't call CFURLRequestSetShouldStartSynchronously from Catalyst WebKit
https://bugs.webkit.org/show_bug.cgi?id=206446
<rdar://problem/57382980>
Patch by Alex Christensen <[email protected]> on 2020-01-17
Reviewed by Tim Horton.
We call it sometimes on iOS but Catalyst WebKit uses macOS CFNetwork, which doesn't like starting synchronously.
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::createNSURLConnection):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (254771 => 254772)
--- trunk/Source/WebCore/ChangeLog 2020-01-17 23:37:05 UTC (rev 254771)
+++ trunk/Source/WebCore/ChangeLog 2020-01-17 23:57:35 UTC (rev 254772)
@@ -1,3 +1,16 @@
+2020-01-17 Alex Christensen <[email protected]>
+
+ Don't call CFURLRequestSetShouldStartSynchronously from Catalyst WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=206446
+ <rdar://problem/57382980>
+
+ Reviewed by Tim Horton.
+
+ We call it sometimes on iOS but Catalyst WebKit uses macOS CFNetwork, which doesn't like starting synchronously.
+
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::createNSURLConnection):
+
2020-01-17 Eric Carlson <[email protected]>
REGRESSION (r254483): media/track/track-cues-sorted-before-dispatch.html became very flaky
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (254771 => 254772)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2020-01-17 23:37:05 UTC (rev 254771)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2020-01-17 23:57:35 UTC (rev 254772)
@@ -95,7 +95,7 @@
LOG(Network, "Handle %p destroyed", this);
}
-#if PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
static bool synchronousWillSendRequestEnabled()
{
@@ -207,8 +207,10 @@
NSMutableDictionary *propertyDictionary = [NSMutableDictionary dictionaryWithDictionary:connectionProperties];
[propertyDictionary setObject:streamProperties forKey:@"kCFURLConnectionSocketStreamProperties"];
const bool usesCache = false;
+#if !PLATFORM(MACCATALYST)
if (synchronousWillSendRequestEnabled())
CFURLRequestSetShouldStartSynchronously([nsRequest _CFURLRequest], 1);
+#endif
#else
NSMutableDictionary *propertyDictionary = [NSMutableDictionary dictionaryWithObject:streamProperties forKey:@"kCFURLConnectionSocketStreamProperties"];
const bool usesCache = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
