Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (261073 => 261074)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1,3 +1,14 @@
+2020-05-04 Emilio Cobos Álvarez <[email protected]>
+
+ Put lh / rlh units behind a flag until bug 211351 is sorted out.
+ https://bugs.webkit.org/show_bug.cgi?id=211356
+
+ Reviewed by Antti Koivisto.
+
+ * web-platform-tests/css/css-values/lh-rlh-on-root-001.html: Enable the flag in relevant tests.
+ * web-platform-tests/css/css-values/lh-unit-001.html:
+ * web-platform-tests/css/css-values/lh-unit-002.html:
+
2020-05-03 Rob Buis <[email protected]>
atob() should not accept a vertical tab
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-rlh-on-root-001.html (261073 => 261074)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-rlh-on-root-001.html 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-rlh-on-root-001.html 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:LineHeightUnitsEnabled=true ] -->
<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=""
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-001.html (261073 => 261074)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-001.html 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-001.html 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:LineHeightUnitsEnabled=true ] -->
<meta charset="utf-8">
<title>CSS Values and Units Test: using lh in line-height</title>
<link rel="author" title="Florian Rivoal" href=""
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-002.html (261073 => 261074)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-002.html 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-values/lh-unit-002.html 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:LineHeightUnitsEnabled=true ] -->
<meta charset="utf-8">
<title>CSS Values and Units Test: using lh in font-size</title>
<link rel="author" title="Florian Rivoal" href=""
Modified: trunk/Source/WebCore/ChangeLog (261073 => 261074)
--- trunk/Source/WebCore/ChangeLog 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebCore/ChangeLog 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1,3 +1,16 @@
+2020-05-04 Emilio Cobos Álvarez <[email protected]>
+
+ Put lh / rlh units behind a flag until bug 211351 is sorted out.
+ https://bugs.webkit.org/show_bug.cgi?id=211356
+
+ Reviewed by Antti Koivisto.
+
+ * css/parser/CSSParserToken.cpp: Use the new runtime flag to disable parsing the units.
+ (WebCore::cssPrimitiveValueUnitFromTrie):
+ * page/RuntimeEnabledFeatures.h: Define the new runtime flag.
+ (WebCore::RuntimeEnabledFeatures::setLineHeightUnitsEnabled):
+ (WebCore::RuntimeEnabledFeatures::lineHeightUnitsEnabled const):
+
2020-05-03 David Kilzer <[email protected]>
Use LocalCurrentGraphicsContext in WebKit::convertPlatformImageToBitmap()
Modified: trunk/Source/WebCore/css/parser/CSSParserToken.cpp (261073 => 261074)
--- trunk/Source/WebCore/css/parser/CSSParserToken.cpp 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebCore/css/parser/CSSParserToken.cpp 2020-05-04 07:16:48 UTC (rev 261074)
@@ -84,7 +84,7 @@
return CSSUnitType::CSS_IN;
break;
case 'l':
- if (toASCIILower(data[1]) == 'h')
+ if (toASCIILower(data[1]) == 'h' && RuntimeEnabledFeatures::sharedFeatures().lineHeightUnitsEnabled())
return CSSUnitType::CSS_LHS;
break;
case 'm':
@@ -144,7 +144,7 @@
return CSSUnitType::CSS_REMS;
break;
case 'l':
- if (toASCIILower(data[2]) == 'h')
+ if (toASCIILower(data[2]) == 'h' && RuntimeEnabledFeatures::sharedFeatures().lineHeightUnitsEnabled())
return CSSUnitType::CSS_RLHS;
break;
}
Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.h (261073 => 261074)
--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2020-05-04 07:16:48 UTC (rev 261074)
@@ -359,6 +359,9 @@
void setCSSLogicalEnabled(bool isEnabled) { m_CSSLogicalEnabled = isEnabled; }
bool cssLogicalEnabled() const { return m_CSSLogicalEnabled; }
+ void setLineHeightUnitsEnabled(bool isEnabled) { m_lineHeightUnitsEnabled = isEnabled; }
+ bool lineHeightUnitsEnabled() const { return m_lineHeightUnitsEnabled; }
+
bool adClickAttributionEnabled() const { return m_adClickAttributionEnabled; }
void setAdClickAttributionEnabled(bool isEnabled) { m_adClickAttributionEnabled = isEnabled; }
bool adClickAttributionDebugModeEnabled() const { return m_adClickAttributionDebugModeEnabled; }
@@ -598,6 +601,10 @@
bool m_CSSLogicalEnabled { 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_adClickAttributionEnabled { false };
bool m_adClickAttributionDebugModeEnabled { false };
Modified: trunk/Source/WebKit/ChangeLog (261073 => 261074)
--- trunk/Source/WebKit/ChangeLog 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebKit/ChangeLog 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1,3 +1,12 @@
+2020-05-04 Emilio Cobos Álvarez <[email protected]>
+
+ Put lh / rlh units behind a flag until bug 211351 is sorted out.
+ https://bugs.webkit.org/show_bug.cgi?id=211356
+
+ Reviewed by Antti Koivisto.
+
+ * Shared/WebPreferences.yaml: Define the runtime flag.
+
2020-05-03 David Kilzer <[email protected]>
Use LocalCurrentGraphicsContext in WebKit::convertPlatformImageToBitmap()
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (261073 => 261074)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1803,6 +1803,14 @@
webcoreBinding: RuntimeEnabledFeatures
category: internal
+LineHeightUnitsEnabled:
+ type: bool
+ defaultValue: false
+ humanReadableName: "lh / rlh units"
+ humanReadableDescription: "Enable the lh and lhr units"
+ webcoreBinding: RuntimeEnabledFeatures
+ category: internal
+
DOMPasteAccessRequestsEnabled:
type: bool
defaultValue: DEFAULT_DOM_PASTE_ACCESS_REQUESTS_ENABLED
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (261073 => 261074)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1,3 +1,17 @@
+2020-05-04 Emilio Cobos Álvarez <[email protected]>
+
+ Put lh / rlh units behind a flag until bug 211351 is sorted out.
+ https://bugs.webkit.org/show_bug.cgi?id=211356
+
+ Reviewed by Antti Koivisto.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences lineHeightUnitsEnabled]):
+ (-[WebPreferences setLineHeightUnitsEnabled:]):
+ * WebView/WebView.mm:
+
2020-04-30 Ross Kirsling <[email protected]>
TriState should be an enum class and use "Indeterminate" instead of "Mixed"
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h (261073 => 261074)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2020-05-04 07:16:48 UTC (rev 261074)
@@ -278,6 +278,7 @@
#define WebKitServerTimingEnabledPreferenceKey @"WebKitServerTimingEnabled"
#define WebKitSelectionAcrossShadowBoundariesEnabledPreferenceKey @"WebKitSelectionAcrossShadowBoundariesEnabled"
#define WebKitCSSLogicalEnabledPreferenceKey @"WebKitCSSLogicalEnabled"
+#define WebKitLineHeightUnitsEnabledPreferenceKey @"WebKitLineHeightUnitsEnabled"
#define WebKitAdClickAttributionEnabledPreferenceKey @"WebKitAdClickAttributionEnabled"
#define WebKitReferrerPolicyAttributeEnabledPreferenceKey @"WebKitReferrerPolicyAttributeEnabled"
#define WebKitResizeObserverEnabledPreferenceKey @"WebKitResizeObserverEnabled"
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (261073 => 261074)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2020-05-04 07:16:48 UTC (rev 261074)
@@ -681,6 +681,7 @@
#endif
@YES, WebKitSelectionAcrossShadowBoundariesEnabledPreferenceKey,
@NO, WebKitCSSLogicalEnabledPreferenceKey,
+ @NO, WebKitLineHeightUnitsEnabledPreferenceKey,
@NO, WebKitAdClickAttributionEnabledPreferenceKey,
#if ENABLE(INTERSECTION_OBSERVER)
@NO, WebKitIntersectionObserverEnabledPreferenceKey,
@@ -3551,6 +3552,16 @@
[self _setBoolValue:flag forKey:WebKitCSSLogicalEnabledPreferenceKey];
}
+- (BOOL)lineHeightUnitsEnabled
+{
+ return [self _boolValueForKey:WebKitLineHeightUnitsEnabledPreferenceKey];
+}
+
+- (void)setLineHeightUnitsEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitLineHeightUnitsEnabledPreferenceKey];
+}
+
- (BOOL)adClickAttributionEnabled
{
return [self _boolValueForKey:WebKitAdClickAttributionEnabledPreferenceKey];
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (261073 => 261074)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2020-05-04 07:16:48 UTC (rev 261074)
@@ -616,6 +616,9 @@
- (void)setCSSLogicalEnabled:(BOOL)flag;
- (BOOL)cssLogicalEnabled;
+- (void)setLineHeightUnitsEnabled:(BOOL)flag;
+- (BOOL)lineHeightUnitsEnabled;
+
- (BOOL)adClickAttributionEnabled;
- (void)setAdClickAttributionEnabled:(BOOL)flag;
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (261073 => 261074)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-05-04 07:16:48 UTC (rev 261074)
@@ -3137,6 +3137,8 @@
RuntimeEnabledFeatures::sharedFeatures().setCSSLogicalEnabled([preferences cssLogicalEnabled]);
+ RuntimeEnabledFeatures::sharedFeatures().setLineHeightUnitsEnabled([preferences lineHeightUnitsEnabled]);
+
RuntimeEnabledFeatures::sharedFeatures().setAdClickAttributionEnabled([preferences adClickAttributionEnabled]);
settings.setHiddenPageDOMTimerThrottlingEnabled([preferences hiddenPageDOMTimerThrottlingEnabled]);
Modified: trunk/Tools/ChangeLog (261073 => 261074)
--- trunk/Tools/ChangeLog 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Tools/ChangeLog 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1,3 +1,16 @@
+2020-05-04 Emilio Cobos Álvarez <[email protected]>
+
+ Put lh / rlh units behind a flag until bug 211351 is sorted out.
+ https://bugs.webkit.org/show_bug.cgi?id=211356
+
+ Reviewed by Antti Koivisto.
+
+ * DumpRenderTree/TestOptions.cpp:
+ (TestOptions::TestOptions):
+ * DumpRenderTree/TestOptions.h:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (setWebPreferencesForTestOptions):
+
2020-05-04 Patrick Griffis <[email protected]>
[Flatpak SDK] Misc flatpakutils.py fixes
Modified: trunk/Tools/DumpRenderTree/TestOptions.cpp (261073 => 261074)
--- trunk/Tools/DumpRenderTree/TestOptions.cpp 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp 2020-05-04 07:16:48 UTC (rev 261074)
@@ -138,6 +138,8 @@
enableWebGPU = parseBooleanTestHeaderValue(value);
else if (key == "internal:CSSLogicalEnabled")
enableCSSLogical = parseBooleanTestHeaderValue(value);
+ else if (key == "internal:LineHeightUnitsEnabled")
+ enableLineHeightUnits = parseBooleanTestHeaderValue(value);
else if (key == "experimental:AdClickAttributionEnabled")
adClickAttributionEnabled = parseBooleanTestHeaderValue(value);
else if (key == "experimental:ResizeObserverEnabled")
Modified: trunk/Tools/DumpRenderTree/TestOptions.h (261073 => 261074)
--- trunk/Tools/DumpRenderTree/TestOptions.h 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Tools/DumpRenderTree/TestOptions.h 2020-05-04 07:16:48 UTC (rev 261074)
@@ -48,6 +48,7 @@
bool enableSelectionAcrossShadowBoundaries { true };
bool enableWebGPU { false };
bool enableCSSLogical { false };
+ bool enableLineHeightUnits { false };
bool adClickAttributionEnabled { false };
bool enableResizeObserver { false };
bool enableCSSOMViewSmoothScrolling { false };
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (261073 => 261074)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2020-05-04 07:13:21 UTC (rev 261073)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2020-05-04 07:16:48 UTC (rev 261074)
@@ -1034,6 +1034,7 @@
preferences.selectionAcrossShadowBoundariesEnabled = options.enableSelectionAcrossShadowBoundaries;
preferences.webGPUEnabled = options.enableWebGPU;
preferences.CSSLogicalEnabled = options.enableCSSLogical;
+ preferences.lineHeightUnitsEnabled = options.enableLineHeightUnits;
preferences.adClickAttributionEnabled = options.adClickAttributionEnabled;
preferences.resizeObserverEnabled = options.enableResizeObserver;
preferences.CSSOMViewSmoothScrollingEnabled = options.enableCSSOMViewSmoothScrolling;
