Title: [236701] trunk/Source
- Revision
- 236701
- Author
- aes...@apple.com
- Date
- 2018-10-01 17:07:04 -0700 (Mon, 01 Oct 2018)
Log Message
[watchOS] Adopt NSURLSessionCompanionProxyPreference
https://bugs.webkit.org/show_bug.cgi?id=190177
<rdar://problem/43402114>
Reviewed by Wenson Hsieh.
Source/WebCore/PAL:
* pal/spi/cf/CFNetworkSPI.h:
Source/WebKit:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
Source/WTF:
* wtf/FeatureDefines.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (236700 => 236701)
--- trunk/Source/WTF/ChangeLog 2018-10-01 23:46:52 UTC (rev 236700)
+++ trunk/Source/WTF/ChangeLog 2018-10-02 00:07:04 UTC (rev 236701)
@@ -1,3 +1,13 @@
+2018-10-01 Andy Estes <aes...@apple.com>
+
+ [watchOS] Adopt NSURLSessionCompanionProxyPreference
+ https://bugs.webkit.org/show_bug.cgi?id=190177
+ <rdar://problem/43402114>
+
+ Reviewed by Wenson Hsieh.
+
+ * wtf/FeatureDefines.h:
+
2018-10-01 Koby Boyango <kob...@mce-sys.com>
[WTF][JSCONLY] Use MainThreadWin on Windows in the JSCOnly port
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (236700 => 236701)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2018-10-01 23:46:52 UTC (rev 236700)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2018-10-02 00:07:04 UTC (rev 236701)
@@ -184,7 +184,7 @@
#if PLATFORM(WATCHOS)
#if !defined(ENABLE_PROXIMITY_NETWORKING)
-#if !TARGET_OS_SIMULATOR
+#if !TARGET_OS_SIMULATOR && __WATCH_OS_VERSION_MIN_REQUIRED < 60000
#define ENABLE_PROXIMITY_NETWORKING 1
#endif
#endif
Modified: trunk/Source/WebCore/PAL/ChangeLog (236700 => 236701)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-10-01 23:46:52 UTC (rev 236700)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-10-02 00:07:04 UTC (rev 236701)
@@ -1,3 +1,13 @@
+2018-10-01 Andy Estes <aes...@apple.com>
+
+ [watchOS] Adopt NSURLSessionCompanionProxyPreference
+ https://bugs.webkit.org/show_bug.cgi?id=190177
+ <rdar://problem/43402114>
+
+ Reviewed by Wenson Hsieh.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
2018-10-01 Daniel Bates <daba...@apple.com>
[iOS] Special keys are misidentified in DOM keyboard events
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (236700 => 236701)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-10-01 23:46:52 UTC (rev 236700)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-10-02 00:07:04 UTC (rev 236701)
@@ -161,6 +161,14 @@
- (NSDate *)_lastModifiedDate;
@end
+#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 60000
+typedef NS_ENUM(NSInteger, NSURLSessionCompanionProxyPreference) {
+ NSURLSessionCompanionProxyPreferenceDefault = 0,
+ NSURLSessionCompanionProxyPreferencePreferCompanion,
+ NSURLSessionCompanionProxyPreferencePreferDirectToCloud,
+};
+#endif
+
@interface NSURLSessionConfiguration ()
@property (assign) _TimingDataOptions _timingDataOptions;
@property (copy) NSData *_sourceApplicationAuditTokenData;
@@ -173,6 +181,9 @@
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
@property (nullable, copy) NSSet *_suppressedAutoAddedHTTPHeaders;
#endif
+#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 60000
+@property NSURLSessionCompanionProxyPreference _companionProxyPreference;
+#endif
@end
@interface NSURLSessionTask ()
Modified: trunk/Source/WebKit/ChangeLog (236700 => 236701)
--- trunk/Source/WebKit/ChangeLog 2018-10-01 23:46:52 UTC (rev 236700)
+++ trunk/Source/WebKit/ChangeLog 2018-10-02 00:07:04 UTC (rev 236701)
@@ -1,3 +1,14 @@
+2018-10-01 Andy Estes <aes...@apple.com>
+
+ [watchOS] Adopt NSURLSessionCompanionProxyPreference
+ https://bugs.webkit.org/show_bug.cgi?id=190177
+ <rdar://problem/43402114>
+
+ Reviewed by Wenson Hsieh.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+
2018-10-01 Chris Dumez <cdu...@apple.com>
[Mac] The UIProcess should listen to memory pressure signals
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (236700 => 236701)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-10-01 23:46:52 UTC (rev 236700)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-10-02 00:07:04 UTC (rev 236701)
@@ -707,6 +707,10 @@
configuration._socketStreamProperties = @{ @"kCFStreamPropertyAutoErrorOnSystemChange" : @(NO) };
#endif
+#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000
+ configuration._companionProxyPreference = NSURLSessionCompanionProxyPreferencePreferDirectToCloud;
+#endif
+
auto* storageSession = WebCore::NetworkStorageSession::storageSession(parameters.sessionID);
RELEASE_ASSERT(storageSession);
if (CFHTTPCookieStorageRef storage = storageSession->cookieStorage().get())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
