Changeset 287653 in webkit

Timestamp:

Jan 5, 2022, 3:02:02 PM (5 years ago)

Author:

timothy_horton@apple.com

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):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/MediaElementSession.cpp (modified) (2 diffs)
• WebCore/loader/DocumentThreadableLoader.cpp (modified) (2 diffs)
• WebCore/platform/Timer.cpp (modified) (2 diffs)
• WebCore/platform/cocoa/VersionChecks.h (modified) (5 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebPreferencesDefaultValues.cpp (modified) (1 diff)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebView.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-05  Tim Horton  <timothy_horton@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  <youenn@apple.com>
 

trunk/Source/WebCore/html/MediaElementSession.cpp

@@ -67 +67 @@
 #include "AudioSession.h"
 #include "RuntimeApplicationChecks.h"
+#include "VersionChecks.h"
 #include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 #endif
@@ -858 +859 @@
     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

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -66 +66 @@
 
 #if PLATFORM(IOS_FAMILY)
+#include "VersionChecks.h"
 #include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 #endif
@@ -202 +203 @@
 
 #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;

trunk/Source/WebCore/platform/Timer.cpp

@@ -38 +38 @@
 
 #if PLATFORM(COCOA)
+#include "VersionChecks.h"
 #include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 #endif
@@ -251 +252 @@
 {
 #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;

trunk/Source/WebCore/platform/cocoa/VersionChecks.h

@@ -37 +37 @@
     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,
@@ -44 +46 @@
     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,
@@ -55 +59 @@
     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,
@@ -62 +67 @@
     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,
@@ -82 +88 @@
     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,

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-05  Tim Horton  <timothy_horton@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_horton@apple.com>
 

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp

@@ -60 +60 @@
 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;
 }

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2022-01-05  Tim Horton  <timothy_horton@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_hsieh@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm

@@ -110 +110 @@
 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;
 }

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -229 +229 @@
 #import <WebCore/UserStyleSheet.h>
 #import <WebCore/ValidationBubble.h>
+#import <WebCore/VersionChecks.h>
 #import <WebCore/WebCoreJITOperations.h>
 #import <WebCore/WebCoreObjCExtras.h>
@@ -1391 +1392 @@
 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;
 }