Title: [287653] trunk/Source
Revision
287653
Author
timothy_hor...@apple.com
Date
2022-01-05 15:02:02 -0800 (Wed, 05 Jan 2022)

Log Message

Move more SDK checks to linkedOnOrAfter()
https://bugs.webkit.org/show_bug.cgi?id=234875

Reviewed by Sam Weinig.

Source/WebCore:

* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::requiresFullscreenForVideoPlayback const):
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequest):
* platform/Timer.cpp:
(WebCore::shouldSuppressThreadSafetyCheck):
* platform/cocoa/VersionChecks.h:

Source/WebKit:

* Shared/WebPreferencesDefaultValues.cpp:
(WebKit::defaultCSSOMViewScrollingAPIEnabled):

Source/WebKitLegacy/mac:

* WebView/WebPreferencesDefaultValues.mm:
(WebKit::defaultJavaScriptCanOpenWindowsAutomatically):
* WebView/WebView.mm:
(needsLaBanquePostaleQuirks):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (287652 => 287653)


--- trunk/Source/WebCore/ChangeLog	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebCore/ChangeLog	2022-01-05 23:02:02 UTC (rev 287653)
@@ -1,3 +1,18 @@
+2022-01-05  Tim Horton  <timothy_hor...@apple.com>
+
+        Move more SDK checks to linkedOnOrAfter()
+        https://bugs.webkit.org/show_bug.cgi?id=234875
+
+        Reviewed by Sam Weinig.
+
+        * html/MediaElementSession.cpp:
+        (WebCore::MediaElementSession::requiresFullscreenForVideoPlayback const):
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequest):
+        * platform/Timer.cpp:
+        (WebCore::shouldSuppressThreadSafetyCheck):
+        * platform/cocoa/VersionChecks.h:
+
 2022-01-05  Youenn Fablet  <you...@apple.com>
 
         MediaRecorder should support the bitsPerSecond option

Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (287652 => 287653)


--- trunk/Source/WebCore/html/MediaElementSession.cpp	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp	2022-01-05 23:02:02 UTC (rev 287653)
@@ -66,6 +66,7 @@
 #if PLATFORM(IOS_FAMILY)
 #include "AudioSession.h"
 #include "RuntimeApplicationChecks.h"
+#include "VersionChecks.h"
 #include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 #endif
 
@@ -857,7 +858,7 @@
 #if PLATFORM(IOS_FAMILY)
     if (CocoaApplication::isIBooks())
         return !m_element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr) && !m_element.hasAttributeWithoutSynchronization(HTMLNames::playsinlineAttr);
-    if (applicationSDKVersion() < DYLD_IOS_VERSION_10_0)
+    if (!linkedOnOrAfter(WebCore::SDKVersion::FirstWithUnprefixedPlaysInlineAttribute))
         return !m_element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr);
 #endif
 

Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (287652 => 287653)


--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp	2022-01-05 23:02:02 UTC (rev 287653)
@@ -65,6 +65,7 @@
 #include <wtf/Ref.h>
 
 #if PLATFORM(IOS_FAMILY)
+#include "VersionChecks.h"
 #include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 #endif
 
@@ -201,7 +202,7 @@
     ASSERT(m_options.mode == FetchOptions::Mode::Cors);
 
 #if PLATFORM(IOS_FAMILY)
-    bool needsPreflightQuirk = IOSApplication::isMoviStarPlus() && applicationSDKVersion() < DYLD_IOS_VERSION_12_0 && (m_options.preflightPolicy == PreflightPolicy::Consider || m_options.preflightPolicy == PreflightPolicy::Force);
+    bool needsPreflightQuirk = IOSApplication::isMoviStarPlus() && !linkedOnOrAfter(WebCore::SDKVersion::FirstWithoutMoviStarPlusCORSPreflightQuirk) && (m_options.preflightPolicy == PreflightPolicy::Consider || m_options.preflightPolicy == PreflightPolicy::Force);
 #else
     bool needsPreflightQuirk = false;
 #endif

Modified: trunk/Source/WebCore/platform/Timer.cpp (287652 => 287653)


--- trunk/Source/WebCore/platform/Timer.cpp	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebCore/platform/Timer.cpp	2022-01-05 23:02:02 UTC (rev 287653)
@@ -37,6 +37,7 @@
 #include <wtf/Vector.h>
 
 #if PLATFORM(COCOA)
+#include "VersionChecks.h"
 #include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 #endif
 
@@ -250,9 +251,9 @@
 static bool shouldSuppressThreadSafetyCheck()
 {
 #if PLATFORM(IOS_FAMILY)
-    return WebThreadIsEnabled() || applicationSDKVersion() < DYLD_IOS_VERSION_12_0;
+    return WebThreadIsEnabled() || !linkedOnOrAfter(WebCore::SDKVersion::FirstWithTimerThreadSafetyChecks);
 #elif PLATFORM(MAC)
-    return !isInWebProcess() && applicationSDKVersion() < DYLD_MACOSX_VERSION_10_14;
+    return !isInWebProcess() && !linkedOnOrAfter(WebCore::SDKVersion::FirstWithTimerThreadSafetyChecks);
 #else
     return false;
 #endif

Modified: trunk/Source/WebCore/platform/cocoa/VersionChecks.h (287652 => 287653)


--- trunk/Source/WebCore/platform/cocoa/VersionChecks.h	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebCore/platform/cocoa/VersionChecks.h	2022-01-05 23:02:02 UTC (rev 287653)
@@ -36,6 +36,8 @@
     FirstThatRequiresUserGestureToLoadVideo = DYLD_IOS_VERSION_10_0,
     FirstWithLinkPreviewEnabledByDefault = DYLD_IOS_VERSION_10_0,
     FirstThatConvertsInvalidURLsToBlank = DYLD_IOS_VERSION_10_0,
+    FirstWithoutTheSecretSocietyHiddenMysteryWindowOpenQuirk = DYLD_IOS_VERSION_10_0,
+    FirstWithUnprefixedPlaysInlineAttribute = DYLD_IOS_VERSION_10_0,
     FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_IOS_VERSION_11_0,
     FirstWithExpiredOnlyReloadBehavior = DYLD_IOS_VERSION_11_0,
     FirstThatDisallowsSettingAnyXHRHeaderFromFileURLs = DYLD_IOS_VERSION_11_3,
@@ -43,6 +45,8 @@
     FirstWhereScrollViewContentInsetsAreNotObscuringInsets = DYLD_IOS_VERSION_12_0,
     FirstWhereUIScrollViewDoesNotApplyKeyboardInsetsUnconditionally = DYLD_IOS_VERSION_12_0,
     FirstWithMainThreadReleaseAssertionInWebPageProxy = DYLD_IOS_VERSION_12_0,
+    FirstWithoutMoviStarPlusCORSPreflightQuirk = DYLD_IOS_VERSION_12_0,
+    FirstWithTimerThreadSafetyChecks = DYLD_IOS_VERSION_12_0,
     FirstWithLazyGestureRecognizerInstallation = DYLD_IOS_VERSION_12_2,
     FirstWithProcessSwapOnCrossSiteNavigation = DYLD_IOS_VERSION_12_2,
     FirstWithoutUnconditionalUniversalSandboxExtension = DYLD_IOS_VERSION_13_0,
@@ -54,6 +58,7 @@
     FirstThatHasUIContextMenuInteraction = DYLD_IOS_VERSION_13_0,
     FirstWhereWKContentViewDoesNotOverrideKeyCommands = DYLD_IOS_VERSION_13_0,
     FirstThatSupportsOverflowHiddenOnMainFrame = DYLD_IOS_VERSION_13_0,
+    FirstWithoutIMDbCSSOMViewScrollingQuirk = DYLD_IOS_VERSION_13_0,
     FirstWhereSiteSpecificQuirksAreEnabledByDefault = DYLD_IOS_VERSION_13_2,
     FirstThatRestrictsBaseURLSchemes = DYLD_IOS_VERSION_13_4,
     FirstThatSendsNativeMouseEvents = DYLD_IOS_VERSION_13_4,
@@ -61,6 +66,7 @@
     FirstWithInitializeWebKit2MainThreadAssertion = DYLD_IOS_VERSION_14_0,
     FirstWithWKWebsiteDataStoreInitReturningNil = DYLD_IOS_VERSION_14_0,
     FirstWithWebSQLDisabledByDefaultInLegacyWebKit = DYLD_IOS_VERSION_14_0,
+    FirstWithoutLaBanquePostaleQuirks = DYLD_IOS_VERSION_14_0,
     FirstVersionWithiOSAppsOnMacOS = DYLD_IOS_VERSION_14_2,
     FirstWithDataURLFragmentRemoval = DYLD_IOS_VERSION_14_5,
     FirstWithHTMLDocumentSupportedPropertyNames = DYLD_IOS_VERSION_14_5,
@@ -81,6 +87,7 @@
     FirstWithExpiredOnlyReloadBehavior = DYLD_MACOSX_VERSION_10_13,
     FirstWithWebIconDatabaseWarning = DYLD_MACOSX_VERSION_10_13,
     FirstWithMainThreadReleaseAssertionInWebPageProxy = DYLD_MACOSX_VERSION_10_14,
+    FirstWithTimerThreadSafetyChecks = DYLD_MACOSX_VERSION_10_14,
     FirstWithoutUnconditionalUniversalSandboxExtension = DYLD_MACOSX_VERSION_10_15,
     FirstWithSnapshotAfterScreenUpdates = DYLD_MACOSX_VERSION_10_15,
     FirstWithExceptionsForRelatedWebViewsUsingDifferentDataStores = DYLD_MACOSX_VERSION_10_15,

Modified: trunk/Source/WebKit/ChangeLog (287652 => 287653)


--- trunk/Source/WebKit/ChangeLog	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebKit/ChangeLog	2022-01-05 23:02:02 UTC (rev 287653)
@@ -1,5 +1,15 @@
 2022-01-05  Tim Horton  <timothy_hor...@apple.com>
 
+        Move more SDK checks to linkedOnOrAfter()
+        https://bugs.webkit.org/show_bug.cgi?id=234875
+
+        Reviewed by Sam Weinig.
+
+        * Shared/WebPreferencesDefaultValues.cpp:
+        (WebKit::defaultCSSOMViewScrollingAPIEnabled):
+
+2022-01-05  Tim Horton  <timothy_hor...@apple.com>
+
         Fix the build
 
         * Shared/ios/WebIOSEventFactory.mm:

Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (287652 => 287653)


--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2022-01-05 23:02:02 UTC (rev 287653)
@@ -59,7 +59,7 @@
 
 bool defaultCSSOMViewScrollingAPIEnabled()
 {
-    static bool result = WebCore::IOSApplication::isIMDb() && applicationSDKVersion() < DYLD_IOS_VERSION_13_0;
+    static bool result = WebCore::IOSApplication::isIMDb() && !linkedOnOrAfter(WebCore::SDKVersion::FirstWithoutIMDbCSSOMViewScrollingQuirk);
     return !result;
 }
 

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (287652 => 287653)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2022-01-05 23:02:02 UTC (rev 287653)
@@ -1,3 +1,15 @@
+2022-01-05  Tim Horton  <timothy_hor...@apple.com>
+
+        Move more SDK checks to linkedOnOrAfter()
+        https://bugs.webkit.org/show_bug.cgi?id=234875
+
+        Reviewed by Sam Weinig.
+
+        * WebView/WebPreferencesDefaultValues.mm:
+        (WebKit::defaultJavaScriptCanOpenWindowsAutomatically):
+        * WebView/WebView.mm:
+        (needsLaBanquePostaleQuirks):
+
 2022-01-02  Wenson Hsieh  <wenson_hs...@apple.com>
 
         [WebKit2] Camera continuity is disabled in richly editable content

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm (287652 => 287653)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm	2022-01-05 23:02:02 UTC (rev 287653)
@@ -109,7 +109,7 @@
 
 bool defaultJavaScriptCanOpenWindowsAutomatically()
 {
-    static bool shouldAllowWindowOpenWithoutUserGesture = WebCore::IOSApplication::isTheSecretSocietyHiddenMystery() && dyld_get_program_sdk_version() < DYLD_IOS_VERSION_10_0;
+    static bool shouldAllowWindowOpenWithoutUserGesture = WebCore::IOSApplication::isTheSecretSocietyHiddenMystery() && !linkedOnOrAfter(WebCore::SDKVersion::FirstWithoutTheSecretSocietyHiddenMysteryWindowOpenQuirk);
     return shouldAllowWindowOpenWithoutUserGesture;
 }
 

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (287652 => 287653)


--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2022-01-05 21:58:55 UTC (rev 287652)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2022-01-05 23:02:02 UTC (rev 287653)
@@ -228,6 +228,7 @@
 #import <WebCore/UserScript.h>
 #import <WebCore/UserStyleSheet.h>
 #import <WebCore/ValidationBubble.h>
+#import <WebCore/VersionChecks.h>
 #import <WebCore/WebCoreJITOperations.h>
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreView.h>
@@ -1390,7 +1391,7 @@
 #if PLATFORM(IOS)
 static bool needsLaBanquePostaleQuirks()
 {
-    static bool needsQuirks = WebCore::IOSApplication::isLaBanquePostale() && dyld_get_program_sdk_version() < DYLD_IOS_VERSION_14_0;
+    static bool needsQuirks = WebCore::IOSApplication::isLaBanquePostale() && !linkedOnOrAfter(WebCore::SDKVersion::FirstWithoutLaBanquePostaleQuirks);
     return needsQuirks;
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to