Title: [206544] branches/safari-602-branch/Tools
- Revision
- 206544
- Author
- [email protected]
- Date
- 2016-09-28 13:48:27 -0700 (Wed, 28 Sep 2016)
Log Message
Merge r206335. rdar://problem/28499358
Modified Paths
Diff
Modified: branches/safari-602-branch/Tools/ChangeLog (206543 => 206544)
--- branches/safari-602-branch/Tools/ChangeLog 2016-09-28 20:48:24 UTC (rev 206543)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-09-28 20:48:27 UTC (rev 206544)
@@ -1,5 +1,23 @@
2016-09-28 Babak Shafiei <[email protected]>
+ Merge r206335. rdar://problem/28499358
+
+ 2016-09-23 Wenson Hsieh <[email protected]>
+
+ [mac-sierra] 2 WKWebViewCandidateTests API test failures
+ https://bugs.webkit.org/show_bug.cgi?id=162470
+
+ Reviewed by Tim Horton.
+
+ VideoControlsManager, WKWebViewCandidateTests and CandidateTests should not be running on 10.12.0. Guard these
+ tests with an SDK check to prevent 10.12.0 bots from building them.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewCandidateTests.mm:
+ * TestWebKitAPI/Tests/mac/CandidateTests.mm:
+
+2016-09-28 Babak Shafiei <[email protected]>
+
Merge r206135. rdar://problem/28499358
2016-09-19 Wenson Hsieh <[email protected]>
Modified: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm (206543 => 206544)
--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm 2016-09-28 20:48:24 UTC (rev 206543)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm 2016-09-28 20:48:27 UTC (rev 206544)
@@ -32,7 +32,7 @@
#import <WebKit/WKWebViewPrivate.h>
#import <wtf/RetainPtr.h>
-#if WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201
@interface WKWebView (WKWebViewAdditions)
@@ -412,4 +412,4 @@
} // namespace TestWebKitAPI
-#endif // WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#endif // WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201
Modified: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewCandidateTests.mm (206543 => 206544)
--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewCandidateTests.mm 2016-09-28 20:48:24 UTC (rev 206543)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewCandidateTests.mm 2016-09-28 20:48:27 UTC (rev 206544)
@@ -25,7 +25,7 @@
#import "config.h"
-#if WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201
#import "PlatformUtilities.h"
#import "TestWKWebViewMac.h"
@@ -243,4 +243,4 @@
#endif
-#endif /* WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 */
+#endif /* WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201 */
Modified: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/mac/CandidateTests.mm (206543 => 206544)
--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/mac/CandidateTests.mm 2016-09-28 20:48:24 UTC (rev 206543)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/mac/CandidateTests.mm 2016-09-28 20:48:27 UTC (rev 206544)
@@ -29,7 +29,7 @@
#import <WebKit/WebViewPrivate.h>
#import <wtf/RetainPtr.h>
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201
static bool webViewWasDeallocated = false;
static bool didFinishLoad = false;
@@ -145,4 +145,4 @@
}
-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
