Title: [254510] trunk
Revision
254510
Author
[email protected]
Date
2020-01-14 08:06:03 -0800 (Tue, 14 Jan 2020)

Log Message

[LFC][Integration] Support the feature flag in DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=206218

Reviewed by Zalan Bujtas.

Source/WebKitLegacy/mac:

* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences layoutFormattingContextIntegrationEnabled]):
(-[WebPreferences setLayoutFormattingContextIntegrationEnabled:]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Tools:

This allows tests to turn off the feature in WK1 if needed.

* DumpRenderTree/TestOptions.cpp:
(TestOptions::TestOptions):
* DumpRenderTree/TestOptions.h:
* DumpRenderTree/mac/DumpRenderTree.mm:
(setWebPreferencesForTestOptions):

LayoutTests:

* platform/mac-wk1/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (254509 => 254510)


--- trunk/LayoutTests/ChangeLog	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/LayoutTests/ChangeLog	2020-01-14 16:06:03 UTC (rev 254510)
@@ -1,3 +1,12 @@
+2020-01-14  Antti Koivisto  <[email protected]>
+
+        [LFC][Integration] Support the feature flag in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=206218
+
+        Reviewed by Zalan Bujtas.
+
+        * platform/mac-wk1/TestExpectations:
+
 2020-01-14  Carlos Alberto Lopez Perez  <[email protected]>
 
         [Freetype] Support for the -webkit-font-smoothing CSS property

Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (254509 => 254510)


--- trunk/LayoutTests/platform/mac-wk1/TestExpectations	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations	2020-01-14 16:06:03 UTC (rev 254510)
@@ -846,9 +846,3 @@
 webkit.org/b/206071 editing/spelling/grammar.html [ Skip ]
 webkit.org/b/206071 editing/spelling/markers.html [ Skip ]
 webkit.org/b/206071 editing/spelling/retro-correction-spelling-markers.html [ Failure ]
-
-# These simple line layout specific tests disable LFC in test header. This is not supported in DRT.
-webkit.org/b/206167 fast/text/embed-at-end-of-pre-wrap-line-simple-lines.html [ ImageOnlyFailure ]
-webkit.org/b/206167 fast/text/simple-line-layout-leading-whitespace-with-soft-hard-linebreak.html [ ImageOnlyFailure ]
-webkit.org/b/206167 fast/text/simple-lines-float.html [ ImageOnlyFailure ]
-webkit.org/b/206167 fast/text/whitespace/pre-wrap-long-word-simple-lines.html [ ImageOnlyFailure ]

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (254509 => 254510)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2020-01-14 16:06:03 UTC (rev 254510)
@@ -1,3 +1,19 @@
+2020-01-14  Antti Koivisto  <[email protected]>
+
+        [LFC][Integration] Support the feature flag in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=206218
+
+        Reviewed by Zalan Bujtas.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences layoutFormattingContextIntegrationEnabled]):
+        (-[WebPreferences setLayoutFormattingContextIntegrationEnabled:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2020-01-09  Tim Horton  <[email protected]>
 
         Adopt TARGET_OS_MACCATALYST in more places

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h (254509 => 254510)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h	2020-01-14 16:06:03 UTC (rev 254510)
@@ -205,6 +205,7 @@
 #define WebKitFetchAPIKeepAliveEnabledPreferenceKey @"WebKitFetchAPIKeepAliveEnabled"
 #define WebKitWebAnimationsCSSIntegrationEnabledPreferenceKey @"WebKitWebAnimationsCSSIntegrationEnabled"
 #define WebKitCSSShadowPartsEnabledPreferenceKey @"WebKitCSSShadowPartsEnabled"
+#define WebKitLayoutFormattingContextIntegrationEnabledPreferenceKey @"WebKitLayoutFormattingContextIntegrationEnabled"
 
 #if !TARGET_OS_IPHONE
 // These are private both because callers should be using the cover methods and because the

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (254509 => 254510)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm	2020-01-14 16:06:03 UTC (rev 254510)
@@ -634,6 +634,7 @@
         @NO, WebKitHighlightAPIEnabledPreferenceKey,
         @YES, WebKitModernMediaControlsEnabledPreferenceKey,
         @YES, WebKitWebAnimationsCSSIntegrationEnabledPreferenceKey,
+        @YES, WebKitLayoutFormattingContextIntegrationEnabledPreferenceKey,
 
 #if ENABLE(WEBGL2)
         @NO, WebKitWebGL2EnabledPreferenceKey,
@@ -3593,6 +3594,16 @@
     [self _setBoolValue:flag forKey:WebKitCSSShadowPartsEnabledPreferenceKey];
 }
 
+- (BOOL)layoutFormattingContextIntegrationEnabled
+{
+    return [self _boolValueForKey:WebKitLayoutFormattingContextIntegrationEnabledPreferenceKey];
+}
+
+- (void)setLayoutFormattingContextIntegrationEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitLayoutFormattingContextIntegrationEnabledPreferenceKey];
+}
+
 - (BOOL)remotePlaybackEnabled
 {
     return [self _boolValueForKey:WebKitRemotePlaybackEnabledPreferenceKey];

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (254509 => 254510)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h	2020-01-14 16:06:03 UTC (rev 254510)
@@ -630,6 +630,9 @@
 - (void)setCSSShadowPartsEnabled:(BOOL)flag;
 - (BOOL)cssShadowPartsEnabled;
 
+- (void)setLayoutFormattingContextIntegrationEnabled:(BOOL)flag;
+- (BOOL)layoutFormattingContextIntegrationEnabled;
+
 - (BOOL)isInAppBrowserPrivacyEnabled;
 - (void)setInAppBrowserPrivacyEnabled:(BOOL)flag;
 

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (254509 => 254510)


--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2020-01-14 16:06:03 UTC (rev 254510)
@@ -3205,6 +3205,7 @@
     RuntimeEnabledFeatures::sharedFeatures().setDialogElementEnabled([preferences dialogElementEnabled]);
     RuntimeEnabledFeatures::sharedFeatures().setKeygenElementEnabled([preferences keygenElementEnabled]);
     RuntimeEnabledFeatures::sharedFeatures().setCSSShadowPartsEnabled([preferences cssShadowPartsEnabled]);
+    RuntimeEnabledFeatures::sharedFeatures().setLayoutFormattingContextIntegrationEnabled([preferences layoutFormattingContextIntegrationEnabled]);
     RuntimeEnabledFeatures::sharedFeatures().setIsInAppBrowserPrivacyEnabled([preferences isInAppBrowserPrivacyEnabled]);
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)

Modified: trunk/Tools/ChangeLog (254509 => 254510)


--- trunk/Tools/ChangeLog	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Tools/ChangeLog	2020-01-14 16:06:03 UTC (rev 254510)
@@ -1,3 +1,18 @@
+2020-01-14  Antti Koivisto  <[email protected]>
+
+        [LFC][Integration] Support the feature flag in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=206218
+
+        Reviewed by Zalan Bujtas.
+
+        This allows tests to turn off the feature in WK1 if needed.
+
+        * DumpRenderTree/TestOptions.cpp:
+        (TestOptions::TestOptions):
+        * DumpRenderTree/TestOptions.h:
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (setWebPreferencesForTestOptions):
+
 2020-01-14  Alicia Boya GarcĂ­a  <[email protected]>
 
         [WTF] Make MediaTime constructor constexpr

Modified: trunk/Tools/DumpRenderTree/TestOptions.cpp (254509 => 254510)


--- trunk/Tools/DumpRenderTree/TestOptions.cpp	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp	2020-01-14 16:06:03 UTC (rev 254510)
@@ -148,6 +148,8 @@
             enableRequestIdleCallback = parseBooleanTestHeaderValue(value);
         else if (key == "experimental:AsyncClipboardAPIEnabled")
             enableAsyncClipboardAPI = parseBooleanTestHeaderValue(value);
+        else if (key == "internal:LayoutFormattingContextIntegrationEnabled")
+            layoutFormattingContextIntegrationEnabled = parseBooleanTestHeaderValue(value);
         pairStart = pairEnd + 1;
     }
 }

Modified: trunk/Tools/DumpRenderTree/TestOptions.h (254509 => 254510)


--- trunk/Tools/DumpRenderTree/TestOptions.h	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Tools/DumpRenderTree/TestOptions.h	2020-01-14 16:06:03 UTC (rev 254510)
@@ -53,6 +53,7 @@
     bool enableCoreMathML { false };
     bool enableRequestIdleCallback { false };
     bool enableAsyncClipboardAPI { false };
+    bool layoutFormattingContextIntegrationEnabled { true };
     std::string jscOptions;
     std::string additionalSupportedImageTypes;
 

Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (254509 => 254510)


--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2020-01-14 15:22:20 UTC (rev 254509)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2020-01-14 16:06:03 UTC (rev 254510)
@@ -1035,6 +1035,7 @@
     preferences.asyncClipboardAPIEnabled = options.enableAsyncClipboardAPI;
     preferences.privateBrowsingEnabled = options.useEphemeralSession;
     preferences.usesPageCache = options.enableBackForwardCache;
+    preferences.layoutFormattingContextIntegrationEnabled = options.layoutFormattingContextIntegrationEnabled;
 }
 
 // Called once on DumpRenderTree startup.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to