Changeset 201492 in webkit

Timestamp:

May 28, 2016, 4:16:50 PM (10 years ago)

Author:

ap@apple.com

Message:

Fix the build with newer clang and other custom configuration options
​https://bugs.webkit.org/show_bug.cgi?id=158161

Reviewed by Dan Bernstein.

Source/WebCore:

• platform/mac/WebVideoFullscreenInterfaceMac.mm:

(WebCore::WebVideoFullscreenInterfaceMac::rateChanged): Added UNUSED_PARAMs for the
case where this function is unimplemented.
(WebCore::WebVideoFullscreenInterfaceMac::setExternalPlayback): Added a non-additions
version of this function.

• platform/spi/cf/CFNetworkSPI.h: Silence nullability-completeness (and other) warnings.

I doubt that it's practical to get these right for every SDK version at this time. Added
functions for overriding HTTPS certicate behavior that we used to declare in .m files.

• platform/spi/mac/AVFoundationSPI.h: Define AVAssetCache conditionally.

Source/WebKit2:

• NetworkProcess/ios/NetworkProcessIOS.mm: -setAllowsSpecificHTTPSCertificate:forHost:

is now in CFNetworkSPI.h

• NetworkProcess/mac/NetworkProcessMac.mm: Ditto.
• Shared/mac/CookieStorageShimLibrary.cpp:

(WebKit::WebKitCookieStorageShimInitialize): Use more portable std::call_once.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm (modified) (2 diffs)
• WebCore/platform/spi/cf/CFNetworkSPI.h (modified) (2 diffs)
• WebCore/platform/spi/mac/AVFoundationSPI.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm (modified) (2 diffs)
• WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (modified) (1 diff)
• WebKit2/Shared/mac/CookieStorageShimLibrary.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-28  Alexey Proskuryakov  <ap@apple.com>
+
+        Fix the build with newer clang and other custom configuration options
+        https://bugs.webkit.org/show_bug.cgi?id=158161
+
+        Reviewed by Dan Bernstein.
+
+        * platform/mac/WebVideoFullscreenInterfaceMac.mm:
+        (WebCore::WebVideoFullscreenInterfaceMac::rateChanged): Added UNUSED_PARAMs for the
+        case where this function is unimplemented.
+        (WebCore::WebVideoFullscreenInterfaceMac::setExternalPlayback): Added a non-additions
+        version of this function.
+        * platform/spi/cf/CFNetworkSPI.h: Silence nullability-completeness (and other) warnings.
+        I doubt that it's practical to get these right for every SDK version at this time. Added
+        functions for overriding HTTPS certicate behavior that we used to declare in .m files.
+        * platform/spi/mac/AVFoundationSPI.h: Define AVAssetCache conditionally.
+
 2016-05-28  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm

@@ -112 +112 @@
 #if USE(APPLE_INTERNAL_SDK)
     [videoFullscreenInterfaceObjC() updateIsPlaying:isPlaying newPlaybackRate:playbackRate];
+#else
+    UNUSED_PARAM(isPlaying);
+    UNUSED_PARAM(playbackRate);
 #endif
 }
@@ -173 +176 @@
 }
 
+void WebVideoFullscreenInterfaceMac::setExternalPlayback(bool, ExternalPlaybackTargetType, String)
+{
+}
+
 bool supportsPictureInPicture()
 {

trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

@@ -24 +24 @@
  */
 
+#pragma clang system_header
+
 #ifndef CFNetworkSPI_h
 #define CFNetworkSPI_h
@@ -86 +88 @@
 #if defined(__OBJC__)
 @interface NSURLRequest ()
++ (NSArray *)allowsSpecificHTTPSCertificateForHost:(NSString *)host;
++ (void)setAllowsSpecificHTTPSCertificate:(NSArray *)allow forHost:(NSString *)host;
 - (void)_setProperty:(id)value forKey:(NSString *)key;
 @end

trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h

@@ -59 +59 @@
 #import <AVFoundation/AVAssetCache_Private.h>
 #else
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#import <AVFoundation/AVAssetCache.h>
+#else
+@interface AVAssetCache : NSObject
+@end
+#endif
 NS_ASSUME_NONNULL_BEGIN
-@interface AVAssetCache : NSObject
+@interface AVAssetCache ()
 + (AVAssetCache *)assetCacheWithURL:(NSURL *)URL;
 - (id)initWithURL:(NSURL *)URL;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-05-28  Alexey Proskuryakov  <ap@apple.com>
+
+        Fix the build with newer clang and other custom configuration options
+        https://bugs.webkit.org/show_bug.cgi?id=158161
+
+        Reviewed by Dan Bernstein.
+
+        * NetworkProcess/ios/NetworkProcessIOS.mm: -setAllowsSpecificHTTPSCertificate:forHost:
+        is now in CFNetworkSPI.h
+        * NetworkProcess/mac/NetworkProcessMac.mm: Ditto.
+        * Shared/mac/CookieStorageShimLibrary.cpp:
+        (WebKit::WebKitCookieStorageShimInitialize): Use more portable std::call_once.
+
 2016-05-28  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm

@@ -34 +34 @@
 #import "SandboxInitializationParameters.h"
 #import "SecItemShim.h"
+#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/CertificateInfo.h>
 #import <WebCore/NotImplemented.h>
@@ -39 +40 @@
 
 #define ENABLE_MANUAL_NETWORK_SANDBOXING 0
-
-@interface NSURLRequest (WKDetails)
-+ (void)setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
-@end
 
 using namespace WebCore;

trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm

@@ -48 +48 @@
 
 using namespace WebCore;
-
-@interface NSURLRequest (Details) 
-+ (void)setAllowsSpecificHTTPSCertificate:(NSArray *)allow forHost:(NSString *)host;
-@end
 
 namespace WebKit {

trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp

@@ -30 +30 @@
 
 #include <WebCore/DynamicLinkerInterposing.h>
+#include <mutex>
 
 extern "C" CFDictionaryRef _CFHTTPCookieStorageCopyRequestHeaderFieldsForURL(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inCookieStorage, CFURLRef inRequestURL);
@@ -81 +82 @@
     // Because the value of cookieStorageShimCallbacks will be read from mulitple threads,
     // only allow it to be initialized once.
-    static int initialized = 0;
-    if (!OSAtomicCompareAndSwapInt(0, 1, &initialized)) {
-        return;
-    }
-
-    cookieStorageShimCallbacks = callbacks;
+    static std::once_flag initializeCallbacksOnceFlag;
+    std::call_once(initializeCallbacksOnceFlag, [&callbacks] { cookieStorageShimCallbacks = callbacks; });
 }