Unreviewed build fix: fix TestWebKitAPI in macCatalyst, tvOS, and
authorkrollin@apple.com <krollin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Nov 2019 22:42:10 +0000 (22:42 +0000)
committerkrollin@apple.com <krollin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Nov 2019 22:42:10 +0000 (22:42 +0000)
watchOS builds by conditionalizing some code on HAVE_UIWEBVIEW and
HAVE_PDFKIT. Follow-up to r251976.

* TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm:
* TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm:
* TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm:
* TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm:
* TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm:
* TestWebKitAPI/Tests/WebKitLegacy/ios/SnapshotViaRenderInContext.mm:
* TestWebKitAPI/Tests/ios/SetTimeoutFunction.mm:
* TestWebKitAPI/config.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252152 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm
Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm
Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm
Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm
Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm
Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/SnapshotViaRenderInContext.mm
Tools/TestWebKitAPI/Tests/ios/SetTimeoutFunction.mm
Tools/TestWebKitAPI/config.h

index 309aa2b..f8beb11 100644 (file)
@@ -1,3 +1,18 @@
+2019-11-06  Keith Rollin  <krollin@apple.com>
+
+        Unreviewed build fix: fix TestWebKitAPI in macCatalyst, tvOS, and
+        watchOS builds by conditionalizing some code on HAVE_UIWEBVIEW and
+        HAVE_PDFKIT. Follow-up to r251976.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm:
+        * TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm:
+        * TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm:
+        * TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm:
+        * TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm:
+        * TestWebKitAPI/Tests/WebKitLegacy/ios/SnapshotViaRenderInContext.mm:
+        * TestWebKitAPI/Tests/ios/SetTimeoutFunction.mm:
+        * TestWebKitAPI/config.h:
+
 2019-11-06  Aakash Jain  <aakash_jain@apple.com>
 
         All EWS status-bubbles shows #1 on security patches when patch is uploaded with webkit-patch --no-review
index a0f5a45..604716a 100644 (file)
@@ -34,7 +34,7 @@
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <wtf/RetainPtr.h>
 
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(PDFKIT) && PLATFORM(IOS)
 
 @interface PDFHostViewController : UIViewController
 + (void)createHostView:(void(^)(id hostViewController))callback forExtensionIdentifier:(NSString *)extensionIdentifier;
index d8cb83a..a6d1e8a 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(UIWEBVIEW)
 
 #import "PlatformUtilities.h"
 #import <AVFoundation/AVAudioSession.h>
index e1039f7..f427cde 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(UIWEBVIEW)
 
 #import "PlatformUtilities.h"
 #import <JavaScriptCore/JSVirtualMachine.h>
index a203619..27b24c5 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(UIWEBVIEW)
 
 #import "PlatformUtilities.h"
 #import <WebKit/DOMHTMLMediaElement.h>
index 9b6c437..2843703 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(UIWEBVIEW)
 
 #import "PlatformUtilities.h"
 #import <UIKit/UIKit.h>
index 1607cd4..565ae0f 100644 (file)
 #if PLATFORM(MAC) || PLATFORM(IOS)
 #define HAVE_PDFKIT 1
 #endif
+
+#if (PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)) || (PLATFORM(MACCATALYST) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600)
+#define HAVE_UIWEBVIEW 1
+#endif