Title: [269280] trunk/Tools
Revision
269280
Author
wei...@apple.com
Date
2020-11-02 16:59:42 -0800 (Mon, 02 Nov 2020)

Log Message

Sort/cleanup preferences in resetWebPreferencesToConsistentValues
https://bugs.webkit.org/show_bug.cgi?id=218467

Reviewed by Darin Adler.

* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):
Sort things.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (269279 => 269280)


--- trunk/Tools/ChangeLog	2020-11-03 00:40:51 UTC (rev 269279)
+++ trunk/Tools/ChangeLog	2020-11-03 00:59:42 UTC (rev 269280)
@@ -1,5 +1,16 @@
 2020-11-02  Sam Weinig  <wei...@apple.com>
 
+        Sort/cleanup preferences in resetWebPreferencesToConsistentValues
+        https://bugs.webkit.org/show_bug.cgi?id=218467
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebPreferencesToConsistentValues):
+        Sort things.
+
+2020-11-02  Sam Weinig  <wei...@apple.com>
+
         [Testing] Match WebKitTestRunner and enable all "experimental" features in DumpRenderTree (cocoa)
         https://bugs.webkit.org/show_bug.cgi?id=218447
 

Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (269279 => 269280)


--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2020-11-03 00:40:51 UTC (rev 269279)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2020-11-03 00:59:42 UTC (rev 269280)
@@ -816,39 +816,12 @@
 
     // FIXME: These experimental features are currently the only ones not enabled for WebKitLegacy, we
     // should either enable them or stop exposing them (as we do with with preferences like HTTP3Enabled).
-    [preferences _setBoolPreferenceForTestingWithValue:NO forKey:@"WebKitWebAuthenticationEnabled"];
+    [preferences _setBoolPreferenceForTestingWithValue:NO forKey:@"WebKitGenericCueAPIEnabled"];
     [preferences _setBoolPreferenceForTestingWithValue:NO forKey:@"WebKitIsLoggedInAPIEnabled"];
-    [preferences _setBoolPreferenceForTestingWithValue:NO forKey:@"WebKitGenericCueAPIEnabled"];
+    [preferences _setBoolPreferenceForTestingWithValue:NO forKey:@"WebKitLazyIframeLoadingEnabled"];
     [preferences _setBoolPreferenceForTestingWithValue:NO forKey:@"WebKitLazyImageLoadingEnabled"];
-    [preferences _setBoolPreferenceForTestingWithValue:NO forKey:@"WebKitLazyIframeLoadingEnabled"];
+    [preferences _setBoolPreferenceForTestingWithValue:NO forKey:@"WebKitWebAuthenticationEnabled"];
 
-    [preferences setStandardFontFamily:@"Times"];
-    [preferences setFixedFontFamily:@"Courier"];
-    [preferences setSerifFontFamily:@"Times"];
-    [preferences setSansSerifFontFamily:@"Helvetica"];
-    [preferences setCursiveFontFamily:@"Apple Chancery"];
-    [preferences setFantasyFontFamily:@"Papyrus"];
-    [preferences setPictographFontFamily:@"Apple Color Emoji"];
-    [preferences setDefaultFontSize:16];
-    [preferences setDefaultFixedFontSize:13];
-    [preferences setDefaultTextEncodingName:@"ISO-8859-1"];
-    [preferences setJavaEnabled:NO];
-    [preferences setEditableLinkBehavior:WebKitEditableLinkOnlyLiveWithShiftKey];
-#if !PLATFORM(IOS_FAMILY)
-    [preferences setShouldPrintBackgrounds:YES];
-#endif
-    [preferences setCacheModel:WebCacheModelDocumentBrowser];
-    [preferences setExperimentalNotificationsEnabled:NO];
-#if !PLATFORM(IOS_FAMILY)
-    [preferences setTextAreasAreResizable:YES];
-#endif
-    [preferences setShrinksStandaloneImagesToFit:YES];
-    [preferences setOfflineWebApplicationCacheEnabled:YES];
-    [preferences setJavaScriptRuntimeFlags:WebKitJavaScriptRuntimeFlagsAllEnabled];
-    [preferences setLoadsSiteIconsIgnoringImageLoadingPreference:NO];
-    [preferences setFrameFlattening:WebKitFrameFlatteningDisabled];
-    [preferences setMetaRefreshEnabled:YES];
-
     if (persistentUserStyleSheetLocation) {
         [preferences setUserStyleSheetLocation:[NSURL URLWithString:(__bridge NSString *)persistentUserStyleSheetLocation.get()]];
         [preferences setUserStyleSheetEnabled:YES];
@@ -855,50 +828,69 @@
     } else
         [preferences setUserStyleSheetEnabled:NO];
 
-    [preferences setMediaPlaybackAllowsInline:YES];
-    [preferences setMediaPlaybackRequiresUserGesture:NO];
-    [preferences setVideoPlaybackRequiresUserGesture:NO];
-    [preferences setAudioPlaybackRequiresUserGesture:NO];
-    [preferences setMediaDataLoadsAutomatically:YES];
-    [preferences setInvisibleAutoplayNotPermitted:NO];
-    [preferences setSubpixelAntialiasedLayerTextEnabled:NO];
-
 #if PLATFORM(IOS_FAMILY)
     // Enable the tracker before creating the first WebView will
     // cause initialization to use the correct database paths.
     [preferences setStorageTrackerEnabled:YES];
+#else
+    [preferences setMockScrollbarsEnabled:YES];
+    [preferences setShouldPrintBackgrounds:YES];
+    [preferences setTextAreasAreResizable:YES];
 #endif
+
     [preferences _setTextAutosizingEnabled:NO];
     [preferences setAcceleratedCompositingEnabled:YES];
-#if USE(CA)
-    [preferences setCanvasUsesAcceleratedDrawing:YES];
     [preferences setAcceleratedDrawingEnabled:useAcceleratedDrawing];
-#endif
-    [preferences setUsePreHTML5ParserQuirks:NO];
     [preferences setAsynchronousSpellCheckingEnabled:NO];
-#if !PLATFORM(IOS_FAMILY)
-    [preferences setMockScrollbarsEnabled:YES];
-#endif
-    [preferences setWebAudioEnabled:YES];
-    [preferences setMediaSourceEnabled:YES];
-    [preferences setSourceBufferChangeTypeEnabled:YES];
+    [preferences setAudioPlaybackRequiresUserGesture:NO];
+    [preferences setCacheModel:WebCacheModelDocumentBrowser];
+    [preferences setCanvasUsesAcceleratedDrawing:YES];
+    [preferences setColorFilterEnabled:YES];
+    [preferences setCursiveFontFamily:@"Apple Chancery"];
+    [preferences setCustomPasteboardDataEnabled:YES];
     [preferences setDataTransferItemsEnabled:YES];
-    [preferences setCustomPasteboardDataEnabled:YES];
+    [preferences setDefaultFixedFontSize:13];
+    [preferences setDefaultFontSize:16];
+    [preferences setDefaultTextEncodingName:@"ISO-8859-1"];
+    [preferences setDirectoryUploadEnabled:YES];
     [preferences setDownloadAttributeEnabled:YES];
-    [preferences setDirectoryUploadEnabled:YES];
+    [preferences setEditableLinkBehavior:WebKitEditableLinkOnlyLiveWithShiftKey];
+    [preferences setEncryptedMediaAPIEnabled:YES];
+    [preferences setExperimentalNotificationsEnabled:NO];
+    [preferences setFantasyFontFamily:@"Papyrus"];
+    [preferences setFixedFontFamily:@"Courier"];
+    [preferences setFrameFlattening:WebKitFrameFlatteningDisabled];
+    [preferences setGamepadsEnabled:YES];
+    [preferences setHiddenPageCSSAnimationSuspensionEnabled:NO];
     [preferences setHiddenPageDOMTimerThrottlingEnabled:NO];
-    [preferences setHiddenPageCSSAnimationSuspensionEnabled:NO];
+    [preferences setInvisibleAutoplayNotPermitted:NO];
+    [preferences setJavaEnabled:NO];
+    [preferences setJavaScriptRuntimeFlags:WebKitJavaScriptRuntimeFlagsAllEnabled];
+    [preferences setLargeImageAsyncDecodingEnabled:NO];
+    [preferences setLinkPreloadEnabled:YES];
+    [preferences setLoadsSiteIconsIgnoringImageLoadingPreference:NO];
+    [preferences setMediaCapabilitiesEnabled:YES];
+    [preferences setMediaDataLoadsAutomatically:YES];
     [preferences setMediaDevicesEnabled:YES];
-    [preferences setLargeImageAsyncDecodingEnabled:NO];
+    [preferences setMediaPlaybackAllowsInline:YES];
+    [preferences setMediaPlaybackRequiresUserGesture:NO];
+    [preferences setMediaPreloadingEnabled:YES];
+    [preferences setMediaSourceEnabled:YES];
+    [preferences setMetaRefreshEnabled:YES];
     [preferences setModernMediaControlsEnabled:YES];
-    [preferences setMediaCapabilitiesEnabled:YES];
+    [preferences setOfflineWebApplicationCacheEnabled:YES];
+    [preferences setPictographFontFamily:@"Apple Color Emoji"];
+    [preferences setSansSerifFontFamily:@"Helvetica"];
     [preferences setSelectionAcrossShadowBoundariesEnabled:YES];
+    [preferences setSerifFontFamily:@"Times"];
+    [preferences setShrinksStandaloneImagesToFit:YES];
+    [preferences setSourceBufferChangeTypeEnabled:YES];
+    [preferences setStandardFontFamily:@"Times"];
+    [preferences setSubpixelAntialiasedLayerTextEnabled:NO];
+    [preferences setUsePreHTML5ParserQuirks:NO];
+    [preferences setVideoPlaybackRequiresUserGesture:NO];
+    [preferences setWebAudioEnabled:YES];
     [preferences setWebSQLEnabled:YES];
-    [preferences setEncryptedMediaAPIEnabled:YES];
-    [preferences setGamepadsEnabled:YES];
-    [preferences setLinkPreloadEnabled:YES];
-    [preferences setMediaPreloadingEnabled:YES];
-    [preferences setColorFilterEnabled:YES];
 
     [WebPreferences _clearNetworkLoaderSession];
     [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to