Changeset 256054 in webkit

Timestamp:

Feb 7, 2020 1:16:57 PM (4 years ago)

Author:

dbates@webkit.org

Message:

Legacy WebKit: Have linkedOnOrAfter() respect the NSDefault WebKitLinkedOnOrAfterEverything and opt DumpRenderTree in
​https://bugs.webkit.org/show_bug.cgi?id=207366

Reviewed by Brent Fulgham.

Source/WebKitLegacy/mac:

If the user default WebKitLinkedOnOrAfterEverything is enabled then have linkedOnOrAfter()
always return true.

• Misc/WebKitVersionChecks.mm:

(linkedOnOrAfter): Read the user default WebKitLinkedOnOrAfterEverything once and cache it.
If the default is enabled then early return true. Outside of tooling this default is unlikely
to be set.

Tools:

Enable default WebKitLinkedOnOrAfterEverything in DumpRenderTree just as we do in WebKitTestRunner.
This lets me put test results for Mac and iOS Legacy WebKit in the same cross-platform directory
as the actual test instead of under a platform-specific directory even when the tests' behavior
depends on the link-time version of WebKit.

Note that testing of pre-linked behavior can still be accomplished by test writers by exposing settings
and toggling them in a test.

• DumpRenderTree/mac/DumpRenderTree.mm:

(setDefaultsToConsistentValuesForTesting):

Location:

trunk

Files:

• Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/mac/Misc/WebKitVersionChecks.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2020-02-07  Daniel Bates  <dabates@apple.com>
+
+        Legacy WebKit: Have linkedOnOrAfter() respect the NSDefault WebKitLinkedOnOrAfterEverything and opt DumpRenderTree in
+        https://bugs.webkit.org/show_bug.cgi?id=207366
+
+        Reviewed by Brent Fulgham.
+
+        If the user default WebKitLinkedOnOrAfterEverything is enabled then have linkedOnOrAfter()
+        always return true.
+
+        * Misc/WebKitVersionChecks.mm:
+        (linkedOnOrAfter): Read the user default WebKitLinkedOnOrAfterEverything once and cache it.
+        If the default is enabled then early return true. Outside of tooling this default is unlikely
+        to be set.
+
 2020-02-07  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebKitLegacy/mac/Misc/WebKitVersionChecks.mm

@@ -30 +30 @@
 
 #import <mach-o/dyld.h>
+#import <mutex>
 
 static int WebKitLinkTimeVersion(void);
@@ -71 +72 @@
 bool linkedOnOrAfter(SDKVersion sdkVersion)
 {
+    static bool linkedOnOrAfterEverything;
+    static std::once_flag once;
+    std::call_once(once, [] {
+        if ([[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitLinkedOnOrAfterEverything"])
+            linkedOnOrAfterEverything = true;
+    });
+    if (UNLIKELY(linkedOnOrAfterEverything))
+        return true;
     return dyld_get_program_sdk_version() >= static_cast<uint32_t>(sdkVersion);
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2020-02-07  Daniel Bates  <dabates@apple.com>
+
+        Legacy WebKit: Have linkedOnOrAfter() respect the NSDefault WebKitLinkedOnOrAfterEverything and opt DumpRenderTree in
+        https://bugs.webkit.org/show_bug.cgi?id=207366
+
+        Reviewed by Brent Fulgham.
+
+        Enable default WebKitLinkedOnOrAfterEverything in DumpRenderTree just as we do in WebKitTestRunner.
+        This lets me put test results for Mac and iOS Legacy WebKit in the same cross-platform directory
+        as the actual test instead of under a platform-specific directory even when the tests' behavior
+        depends on the link-time version of WebKit.
+
+        Note that testing of pre-linked behavior can still be accomplished by test writers by exposing settings
+        and toggling them in a test.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (setDefaultsToConsistentValuesForTesting):
+
 2020-02-03  Sam Weinig  <weinig@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1072 +1072 @@
         WebKitAllowsInlineMediaPlaybackPreferenceKey: @YES,
         WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey: @NO,
+        @"WebKitLinkedOnOrAfterEverything": @YES,
         @"UseWebKitWebInspector": @YES,
 #if !PLATFORM(IOS_FAMILY)