Clean up from enabling lh/rlh units

https://bugs.webkit.org/show_bug.cgi?id=250163 rdar://103933593 Reviewed by Tim Nguyen. I looked through all the places where the preference name was mentioned. * LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-rlh-on-root-001.html: * LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-001.html: * LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-002.html: * Source/WebCore/css/typedom/CSSUnitValue.cpp: (WebCore::CSSUnitValue::parseUnit): * Source/WebCore/page/DeprecatedGlobalSettings.h: * Tools/DumpRenderTree/TestOptions.cpp: (WTR::TestOptions::defaults): Canonical link: https://commits.webkit.org/258603@main
WebKit · Jan 7, 2023 · c7a1baf · c7a1baf
1 parent c3b5f31
commit c7a1baf
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-rlh-on-root-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-rlh-on-root-001.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ LineHeightUnitsEnabled=true ] -->
+<!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Values and Units Test: using lh and rlh units on the root element</title>
 <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">

diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-001.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ LineHeightUnitsEnabled=true ] -->
+<!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Values and Units Test: using lh in line-height</title>
 <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">

diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-002.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-002.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ LineHeightUnitsEnabled=true ] -->
+<!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Values and Units Test: using lh in font-size</title>
 <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">

diff --git a/Source/WebCore/css/typedom/CSSUnitValue.cpp b/Source/WebCore/css/typedom/CSSUnitValue.cpp
@@ -49,14 +49,6 @@ CSSUnitType CSSUnitValue::parseUnit(const String& unit)
         return CSSUnitType::CSS_NUMBER;
     if (unit == "percent"_s)
         return CSSUnitType::CSS_PERCENTAGE;
-
-    // FIXME: Remove these when LineHeightUnitsEnabled is changed back to true or removed
-    // https://bugs.webkit.org/show_bug.cgi?id=211351
-    if (unit == "lh"_s)
-        return CSSUnitType::CSS_LHS;
-    if (unit == "rlh"_s)
-        return CSSUnitType::CSS_RLHS;
-
     return CSSParserToken::stringToUnitType(unit);
 }
 

diff --git a/Source/WebCore/page/DeprecatedGlobalSettings.h b/Source/WebCore/page/DeprecatedGlobalSettings.h
@@ -262,9 +262,7 @@ class DeprecatedGlobalSettings {
 
     bool m_isReadableByteStreamAPIEnabled { false };
 
-    // False by default until https://bugs.webkit.org/show_bug.cgi?id=211351 /
-    // https://github.com/w3c/csswg-drafts/issues/3257 have been sorted out.
-    bool m_lineHeightUnitsEnabled { false };
+    bool m_lineHeightUnitsEnabled { true };
 
     bool m_privateClickMeasurementDebugModeEnabled { false };
 #if HAVE(RSA_BSSA)

diff --git a/Tools/DumpRenderTree/TestOptions.cpp b/Tools/DumpRenderTree/TestOptions.cpp
@@ -149,7 +149,6 @@ const TestFeatures& TestOptions::defaults()
             { "JavaScriptEnabled", true },
             { "KeygenElementEnabled", false },
             { "LayoutFormattingContextIntegrationEnabled", true },
-            { "LineHeightUnitsEnabled", false },
             { "LoadsImagesAutomatically", true },
             { "MainContentUserGestureOverrideEnabled", false },
             { "MenuItemElementEnabled", false },