Modified: trunk/Source/WebCore/ChangeLog (275278 => 275279)
--- trunk/Source/WebCore/ChangeLog 2021-03-31 13:40:44 UTC (rev 275278)
+++ trunk/Source/WebCore/ChangeLog 2021-03-31 14:10:06 UTC (rev 275279)
@@ -1,3 +1,48 @@
+2021-03-31 Antti Koivisto <[email protected]>
+
+ Use :is() instead of :matches() on UA stylesheet
+ https://bugs.webkit.org/show_bug.cgi?id=223996
+
+ Reviewed by Antoine Quint.
+
+ Use the standard name.
+
+ * css/html.css:
+ (:is(article, aside, nav, section) h1):
+ (:is(article, aside, nav, section) :is(article, aside, nav, section) h1):
+ (:is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) h1):
+ (:is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) h1):
+ (:is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) h1):
+ (#endif):
+ (#if defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY):
+ (input:is([type="hidden"], [type="image"], [type="file"])):
+ (input:is([type="radio"], [type="checkbox"])):
+ (input:is([type="button"], [type="submit"], [type="reset"])):
+ (input:is([type="button"], [type="submit"], [type="reset"]), input[type="file"]::file-selector-button, button):
+ (input:is([type="button"], [type="submit"], [type="reset"]):active, input[type="file"]::file-selector-button:active, button:active):
+ (input:is([type="button"], [type="submit"], [type="reset"]):active, input[type="file"]:active::file-selector-button, button:active):
+ (input:is([type="button"], [type="submit"], [type="reset"]):active:disabled,):
+ (input:is([type="button"], [type="submit"], [type="reset"]):disabled,):
+ (input:is([type="checkbox"], [type="radio"]):checked):
+ (input:is([type="checkbox"], [type="radio"]):disabled):
+ (input:is([type="checkbox"], [type="radio"]):checked:disabled):
+ (:matches(article, aside, nav, section) h1): Deleted.
+ (:matches(article, aside, nav, section) :matches(article, aside, nav, section) h1): Deleted.
+ (:matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) h1): Deleted.
+ (:matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) h1): Deleted.
+ (:matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) h1): Deleted.
+ (input:matches([type="hidden"], [type="image"], [type="file"])): Deleted.
+ (input:matches([type="radio"], [type="checkbox"])): Deleted.
+ (input:matches([type="button"], [type="submit"], [type="reset"])): Deleted.
+ (input:matches([type="button"], [type="submit"], [type="reset"]), input[type="file"]::file-selector-button, button): Deleted.
+ (input:matches([type="button"], [type="submit"], [type="reset"]):active, input[type="file"]::file-selector-button:active, button:active): Deleted.
+ (input:matches([type="button"], [type="submit"], [type="reset"]):active, input[type="file"]:active::file-selector-button, button:active): Deleted.
+ (input:matches([type="button"], [type="submit"], [type="reset"]):active:disabled,): Deleted.
+ (input:matches([type="button"], [type="submit"], [type="reset"]):disabled,): Deleted.
+ (input:matches([type="checkbox"], [type="radio"]):checked): Deleted.
+ (input:matches([type="checkbox"], [type="radio"]):disabled): Deleted.
+ (input:matches([type="checkbox"], [type="radio"]):checked:disabled): Deleted.
+
2021-03-31 Zalan Bujtas <[email protected]>
[RenderTreeBuilder] Do not merge anonymous table cells with mismatching children types
Modified: trunk/Source/WebCore/css/html.css (275278 => 275279)
--- trunk/Source/WebCore/css/html.css 2021-03-31 13:40:44 UTC (rev 275278)
+++ trunk/Source/WebCore/css/html.css 2021-03-31 14:10:06 UTC (rev 275279)
@@ -136,31 +136,31 @@
font-weight: bold;
}
-:matches(article, aside, nav, section) h1 {
+:is(article, aside, nav, section) h1 {
font-size: 1.5em;
-webkit-margin-before: 0.83__qem;
-webkit-margin-after: 0.83em;
}
-:matches(article, aside, nav, section) :matches(article, aside, nav, section) h1 {
+:is(article, aside, nav, section) :is(article, aside, nav, section) h1 {
font-size: 1.17em;
-webkit-margin-before: 1__qem;
-webkit-margin-after: 1em;
}
-:matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) h1 {
+:is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) h1 {
font-size: 1.00em;
-webkit-margin-before: 1.33__qem;
-webkit-margin-after: 1.33em;
}
-:matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) h1 {
+:is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) h1 {
font-size: .83em;
-webkit-margin-before: 1.67__qem;
-webkit-margin-after: 1.67em;
}
-:matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) :matches(article, aside, nav, section) h1 {
+:is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) :is(article, aside, nav, section) h1 {
font-size: .67em;
-webkit-margin-before: 2.33__qem;
-webkit-margin-after: 2.33em;
@@ -505,7 +505,7 @@
#endif
#if defined(ENABLE_DATE_AND_TIME_INPUT_TYPES) && ENABLE_DATE_AND_TIME_INPUT_TYPES
-input:matches([type="date"], [type="time"], [type="datetime-local"], [type="month"], [type="week"]) {
+input:is([type="date"], [type="time"], [type="datetime-local"], [type="month"], [type="week"]) {
-webkit-appearance: textfield;
align-items: center;
display: -webkit-inline-flex;
@@ -528,7 +528,7 @@
}
#if defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY
-input:matches([type="date"], [type="time"], [type="datetime-local"], [type="month"], [type="week"]):disabled {
+input:is([type="date"], [type="time"], [type="datetime-local"], [type="month"], [type="week"]):disabled {
background-color: -apple-system-secondary-fill-disabled;
color: -apple-system-tertiary-label;
opacity: initial;
@@ -784,7 +784,7 @@
-webkit-text-security: disc !important;
}
-input:matches([type="hidden"], [type="image"], [type="file"]) {
+input:is([type="hidden"], [type="image"], [type="file"]) {
-webkit-appearance: initial;
padding: initial;
background-color: initial;
@@ -813,7 +813,7 @@
color: #000000 !important;
}
-input:matches([type="radio"], [type="checkbox"]) {
+input:is([type="radio"], [type="checkbox"]) {
margin: 3px 2px;
#if defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY
border: initial;
@@ -825,7 +825,7 @@
#endif
}
-input:matches([type="button"], [type="submit"], [type="reset"]) {
+input:is([type="button"], [type="submit"], [type="reset"]) {
-webkit-appearance: push-button;
white-space: pre;
}
@@ -837,7 +837,7 @@
font-size: inherit;
}
-input:matches([type="button"], [type="submit"], [type="reset"]), input[type="file"]::file-selector-button, button {
+input:is([type="button"], [type="submit"], [type="reset"]), input[type="file"]::file-selector-button, button {
align-items: flex-start;
text-align: center;
cursor: default;
@@ -856,7 +856,7 @@
box-sizing: border-box;
}
-input:matches([type="button"], [type="submit"], [type="reset"]):active, input[type="file"]::file-selector-button:active, button:active {
+input:is([type="button"], [type="submit"], [type="reset"]):active, input[type="file"]::file-selector-button:active, button:active {
#if !(defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY)
color: ActiveButtonText;
#else
@@ -928,7 +928,7 @@
#if !(defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY)
-input:matches([type="button"], [type="submit"], [type="reset"]):disabled,
+input:is([type="button"], [type="submit"], [type="reset"]):disabled,
input[type="file"]:disabled::file-selector-button, button:disabled,
select:disabled, keygen:disabled, optgroup:disabled, option:disabled,
select[disabled]>option {
@@ -935,11 +935,11 @@
color: GrayText;
}
-input:matches([type="button"], [type="submit"], [type="reset"]):active, input[type="file"]:active::file-selector-button, button:active {
+input:is([type="button"], [type="submit"], [type="reset"]):active, input[type="file"]:active::file-selector-button, button:active {
border-style: inset;
}
-input:matches([type="button"], [type="submit"], [type="reset"]):active:disabled,
+input:is([type="button"], [type="submit"], [type="reset"]):active:disabled,
input[type="file"]:active:disabled::file-selector-button, button:active:disabled {
border-style: outset;
}
@@ -951,7 +951,7 @@
opacity: initial;
}
-input:matches([type="button"], [type="submit"], [type="reset"]):disabled,
+input:is([type="button"], [type="submit"], [type="reset"]):disabled,
input[type="file"]:disabled::file-selector-button,
button:disabled,
select:disabled {
@@ -1000,15 +1000,15 @@
background: rgba(0, 0, 0, 0.8);
}
-input:matches([type="checkbox"], [type="radio"]):checked {
+input:is([type="checkbox"], [type="radio"]):checked {
border-color: rgba(255, 255, 255, 0.0);
}
-input:matches([type="checkbox"], [type="radio"]):disabled {
+input:is([type="checkbox"], [type="radio"]):disabled {
opacity: initial;
}
-input:matches([type="checkbox"], [type="radio"]):checked:disabled {
+input:is([type="checkbox"], [type="radio"]):checked:disabled {
opacity: initial;
background: rgba(0, 0, 0, 0.8);
}
@@ -1303,7 +1303,7 @@
}
#endif
-input:matches([type="button"], [type="checkbox"], [type="file"], [type="hidden"], [type="image"], [type="radio"], [type="reset"], [type="search"], [type="submit"]):focus,
+input:is([type="button"], [type="checkbox"], [type="file"], [type="hidden"], [type="image"], [type="radio"], [type="reset"], [type="search"], [type="submit"]):focus,
input[type="file"]:focus::file-selector-button {
outline-offset: 0;
}
