Diff
Modified: trunk/Source/WTF/ChangeLog (211989 => 211990)
--- trunk/Source/WTF/ChangeLog 2017-02-09 21:34:19 UTC (rev 211989)
+++ trunk/Source/WTF/ChangeLog 2017-02-09 21:47:14 UTC (rev 211990)
@@ -1,3 +1,21 @@
+2017-02-09 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r211980 and r211987.
+ https://bugs.webkit.org/show_bug.cgi?id=168072
+
+ Caused API test WebKit2.DuplicateCompletionHandlerCalls to
+ fail (Requested by ryanhaddad on #webkit).
+
+ Reverted changesets:
+
+ "Transition "WebKit Library Version" checks to SDK version
+ checks."
+ https://bugs.webkit.org/show_bug.cgi?id=168056
+ http://trac.webkit.org/changeset/211980
+
+ "Build fix for APPLE_INTERNAL_SDK builds after r211980."
+ http://trac.webkit.org/changeset/211987
+
2017-02-09 Alexey Proskuryakov <[email protected]>
Remove unused WebThreadRunSync
Modified: trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h (211989 => 211990)
--- trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h 2017-02-09 21:34:19 UTC (rev 211989)
+++ trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h 2017-02-09 21:47:14 UTC (rev 211990)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,10 +37,6 @@
#define DYLD_MACOSX_VERSION_10_12 0x000A0C00
#endif
-#ifndef DYLD_MACOSX_VERSION_10_12_4
-#define DYLD_MACOSX_VERSION_10_12_4 0x000A0C04
-#endif
-
#else
#define DYLD_IOS_VERSION_3_0 0x00030000
@@ -50,11 +46,8 @@
#define DYLD_IOS_VERSION_7_0 0x00070000
#define DYLD_IOS_VERSION_9_0 0x00090000
#define DYLD_IOS_VERSION_10_0 0x000A0000
-#define DYLD_IOS_VERSION_10_3 0x000A0300
-#define DYLD_MACOSX_VERSION_10_11 0x000A0B00
#define DYLD_MACOSX_VERSION_10_12 0x000A0C00
-#define DYLD_MACOSX_VERSION_10_12_4 0x000A0C04
#endif
Modified: trunk/Source/WebKit2/ChangeLog (211989 => 211990)
--- trunk/Source/WebKit2/ChangeLog 2017-02-09 21:34:19 UTC (rev 211989)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-09 21:47:14 UTC (rev 211990)
@@ -1,3 +1,21 @@
+2017-02-09 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r211980 and r211987.
+ https://bugs.webkit.org/show_bug.cgi?id=168072
+
+ Caused API test WebKit2.DuplicateCompletionHandlerCalls to
+ fail (Requested by ryanhaddad on #webkit).
+
+ Reverted changesets:
+
+ "Transition "WebKit Library Version" checks to SDK version
+ checks."
+ https://bugs.webkit.org/show_bug.cgi?id=168056
+ http://trac.webkit.org/changeset/211980
+
+ "Build fix for APPLE_INTERNAL_SDK builds after r211980."
+ http://trac.webkit.org/changeset/211987
+
2017-02-09 Brady Eidson <[email protected]>
Transition "WebKit Library Version" checks to SDK version checks.
Modified: trunk/Source/WebKit2/Shared/Cocoa/CompletionHandlerCallChecker.mm (211989 => 211990)
--- trunk/Source/WebKit2/Shared/Cocoa/CompletionHandlerCallChecker.mm 2017-02-09 21:34:19 UTC (rev 211989)
+++ trunk/Source/WebKit2/Shared/Cocoa/CompletionHandlerCallChecker.mm 2017-02-09 21:47:14 UTC (rev 211990)
@@ -67,7 +67,7 @@
static bool shouldThrowException;
static std::once_flag once;
std::call_once(once, [] {
- shouldThrowException = linkedOnOrAfter(SDKVersion::FirstWithExceptionsForDuplicateCompletionHandlerCalls);
+ shouldThrowException = linkedOnOrAfter(LibraryVersion::FirstWithExceptionsForDuplicateCompletionHandlerCalls);
});
return shouldThrowException;
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (211989 => 211990)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-02-09 21:34:19 UTC (rev 211989)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-02-09 21:47:14 UTC (rev 211990)
@@ -145,7 +145,7 @@
_inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
_allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;
_mediaDataLoadsAutomatically = NO;
- if (linkedOnOrAfter(WebKit::SDKVersion::FirstWithMediaTypesRequiringUserActionForPlayback))
+ if (linkedOnOrAfter(WebKit::LibraryVersion::FirstWithMediaTypesRequiringUserActionForPlayback))
_mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeAudio;
else
_mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeAll;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h (211989 => 211990)
--- trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h 2017-02-09 21:34:19 UTC (rev 211989)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h 2017-02-09 21:47:14 UTC (rev 211990)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -25,44 +25,21 @@
#pragma once
-#import <wtf/spi/darwin/dyldSPI.h>
-
namespace WebKit {
-enum class SDKVersion : uint32_t {
-#if PLATFORM(IOS)
- FirstWithNetworkCache = DYLD_IOS_VERSION_9_0,
- FirstWithMediaTypesRequiringUserActionForPlayback = DYLD_IOS_VERSION_10_0,
- FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_IOS_VERSION_10_3,
-#elif PLATFORM(MAC)
- FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,
- FirstWithMediaTypesRequiringUserActionForPlayback = DYLD_MACOSX_VERSION_10_12,
- FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_MACOSX_VERSION_10_12_4,
-#endif
-};
-
-bool linkedOnOrAfter(SDKVersion);
-
/*
- During ToT WebKit development is is not always possible to use an SDK version, so we instead use
- WebKit Library Version numbering.
-
- This technique has a big drawback; The check will fail if the application doesn't directly link
- against WebKit (e.g., It links to a different framework which links to WebKit).
-
- Once a new WebKit Library Version is released in an SDK, all linkedOnOrAfter checks should be moved
- from LibraryVersions to SDKVersions.
-
- Library version numbers are based on the 'current library version' specified in the WebKit build rules.
+ Version numbers are based on the 'current library version' specified in the WebKit build rules.
All of these methods return or take version numbers with each part shifted to the left 2 bytes.
For example the version 1.2.3 is returned as 0x00010203 and version 200.3.5 is returned as 0x00C80305
A version of -1 is returned if the main executable did not link against WebKit.
- Use the current WebKit version number, available in WebKit2/Configurations/Version.xcconfig,
+ Please use the current WebKit version number, available in WebKit2/Configurations/Version.xcconfig,
when adding a new version constant.
*/
-
enum class LibraryVersion {
+ FirstWithNetworkCache = 0x02590116, // 601.1.22
+ FirstWithMediaTypesRequiringUserActionForPlayback = 0x025A0121, // 602.1.33
+ FirstWithExceptionsForDuplicateCompletionHandlerCalls = 0x025B0111, // 603.1.17
};
bool linkedOnOrAfter(LibraryVersion);
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.mm (211989 => 211990)
--- trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.mm 2017-02-09 21:34:19 UTC (rev 211989)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.mm 2017-02-09 21:47:14 UTC (rev 211990)
@@ -55,9 +55,4 @@
return linkedVersion >= static_cast<int>(version);
}
-bool linkedOnOrAfter(SDKVersion version)
-{
- return dyld_get_program_sdk_version() >= static_cast<uint32_t>(version);
}
-
-}
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (211989 => 211990)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-02-09 21:34:19 UTC (rev 211989)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-02-09 21:47:14 UTC (rev 211990)
@@ -462,7 +462,7 @@
bool networkCacheEnabledByDefaults = [defaults boolForKey:WebKitNetworkCacheEnabledDefaultsKey];
- return networkCacheEnabledByDefaults && linkedOnOrAfter(SDKVersion::FirstWithNetworkCache);
+ return networkCacheEnabledByDefaults && linkedOnOrAfter(LibraryVersion::FirstWithNetworkCache);
#else
return false;
#endif
