Title: [196088] trunk
- Revision
- 196088
- Author
- [email protected]
- Date
- 2016-02-03 15:53:31 -0800 (Wed, 03 Feb 2016)
Log Message
Yosemite build fix; hide the entire WebCoreNSURLSessionDataTask class from Yosemite and prior.
Source/WebCore:
* platform/network/cocoa/WebCoreNSURLSession.h:
* platform/network/cocoa/WebCoreNSURLSession.mm:
(-[WebCoreNSURLSessionDataTask initWithSession:identifier:URL:]):
(-[WebCoreNSURLSessionDataTask initWithSession:identifier:request:]):
Tools:
* TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (196087 => 196088)
--- trunk/Source/WebCore/ChangeLog 2016-02-03 23:30:30 UTC (rev 196087)
+++ trunk/Source/WebCore/ChangeLog 2016-02-03 23:53:31 UTC (rev 196088)
@@ -1,5 +1,14 @@
2016-02-03 Jer Noble <[email protected]>
+ Yosemite build fix; hide the entire WebCoreNSURLSessionDataTask class from Yosemite and prior.
+
+ * platform/network/cocoa/WebCoreNSURLSession.h:
+ * platform/network/cocoa/WebCoreNSURLSession.mm:
+ (-[WebCoreNSURLSessionDataTask initWithSession:identifier:URL:]):
+ (-[WebCoreNSURLSessionDataTask initWithSession:identifier:request:]):
+
+2016-02-03 Jer Noble <[email protected]>
+
[EME][Mac] MediaKeys.createSession() fails with initData containing a contentId whose length is > 1/2 the initData.
https://bugs.webkit.org/show_bug.cgi?id=153517
<rdar://problem/24303782>
Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h (196087 => 196088)
--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h 2016-02-03 23:30:30 UTC (rev 196087)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h 2016-02-03 23:53:31 UTC (rev 196088)
@@ -26,6 +26,8 @@
#ifndef WebCoreNSURLSession_h
#define WebCoreNSURLSession_h
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+
#import "CachedRawResource.h"
#import "CachedResourceHandle.h"
#import <Foundation/NSURLSession.h>
@@ -129,4 +131,6 @@
NS_ASSUME_NONNULL_END
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+
#endif
Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (196087 => 196088)
--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-02-03 23:30:30 UTC (rev 196087)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-02-03 23:53:31 UTC (rev 196088)
@@ -26,21 +26,15 @@
#import "config.h"
#import "WebCoreNSURLSession.h"
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+
#import "CachedRawResource.h"
#import "CachedResourceLoader.h"
#import "CachedResourceRequest.h"
-#import "SoftLinking.h"
#import "SubresourceLoader.h"
using namespace WebCore;
-#pragma mark - Soft linking
-
-// FIXME: Soft Linking is required for Yosemite; remove once Yosemite support is no longer needed.
-SOFT_LINK_FRAMEWORK(Foundation);
-SOFT_LINK_CONSTANT_MAY_FAIL(Foundation, NSURLSessionTaskPriorityDefault, float)
-#define NSURLSessionTaskPriorityDefault getNSURLSessionTaskPriorityDefault()
-
#pragma mark - Private declarations
NS_ASSUME_NONNULL_BEGIN
@@ -333,7 +327,7 @@
self.taskIdentifier = identifier;
self.session = session;
self.state = NSURLSessionTaskStateSuspended;
- self.priority = canLoadNSURLSessionTaskPriorityDefault() ? NSURLSessionTaskPriorityDefault : 0.5f;
+ self.priority = NSURLSessionTaskPriorityDefault;
self.originalRequest = self.currentRequest = [NSURLRequest requestWithURL:url];
_client = std::make_unique<WebCoreNSURLSessionDataTaskClient>(self);
@@ -345,7 +339,7 @@
self.taskIdentifier = identifier;
self.session = session;
self.state = NSURLSessionTaskStateSuspended;
- self.priority = canLoadNSURLSessionTaskPriorityDefault() ? NSURLSessionTaskPriorityDefault : 0.5f;
+ self.priority = NSURLSessionTaskPriorityDefault;
self.originalRequest = self.currentRequest = request;
_client = std::make_unique<WebCoreNSURLSessionDataTaskClient>(self);
@@ -546,3 +540,5 @@
}];
}
@end
+
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
Modified: trunk/Tools/ChangeLog (196087 => 196088)
--- trunk/Tools/ChangeLog 2016-02-03 23:30:30 UTC (rev 196087)
+++ trunk/Tools/ChangeLog 2016-02-03 23:53:31 UTC (rev 196088)
@@ -1,3 +1,9 @@
+2016-02-03 Jer Noble <[email protected]>
+
+ Yosemite build fix; hide the entire WebCoreNSURLSessionDataTask class from Yosemite and prior.
+
+ * TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm:
+
2016-02-03 Joonghun Park <[email protected]>
[Tools] Remove $additionalCMakeArgs variable because without this variable --cmakeargs options works well
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm (196087 => 196088)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm 2016-02-03 23:30:30 UTC (rev 196087)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm 2016-02-03 23:53:31 UTC (rev 196088)
@@ -24,6 +24,9 @@
*/
#import "config.h"
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+
#import "PlatformUtilities.h"
#import <WebKit/WebView.h>
#import <WebCore/FrameLoadRequest.h>
@@ -157,5 +160,6 @@
[session release];
}
+#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
