Diff
Modified: trunk/Source/WebCore/ChangeLog (274529 => 274530)
--- trunk/Source/WebCore/ChangeLog 2021-03-16 23:02:23 UTC (rev 274529)
+++ trunk/Source/WebCore/ChangeLog 2021-03-16 23:02:47 UTC (rev 274530)
@@ -1,3 +1,16 @@
+2021-03-16 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r274473.
+ https://bugs.webkit.org/show_bug.cgi?id=223287
+
+ Caused assertion failure in API tests
+
+ Reverted changeset:
+
+ "[iOS][FCR] Add pressed state for button-like controls"
+ https://bugs.webkit.org/show_bug.cgi?id=223208
+ https://trac.webkit.org/changeset/274473
+
2021-03-16 Alexey Shvayka <[email protected]>
[WebIDL] Optimize convertRecord() to avoid double |key| lookup
Modified: trunk/Source/WebCore/css/html.css (274529 => 274530)
--- trunk/Source/WebCore/css/html.css 2021-03-16 23:02:23 UTC (rev 274529)
+++ trunk/Source/WebCore/css/html.css 2021-03-16 23:02:47 UTC (rev 274530)
@@ -867,11 +867,7 @@
#endif
input:matches([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
- opacity: initial;
-#else
color: ActiveButtonText;
-#endif
}
input[type="range"] {
@@ -1012,10 +1008,6 @@
opacity: initial;
background: rgba(0, 0, 0, 0.8);
}
-
-input:matches([type="checkbox"], [type="radio"]):active {
- opacity: initial;
-}
#endif
#if !(defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY)
@@ -1029,10 +1021,6 @@
select:focus {
border-color: rgb(17, 46, 135);
}
-
-select:active {
- opacity: initial;
-}
#endif
#if defined(ENABLE_INPUT_TYPE_COLOR) && ENABLE_INPUT_TYPE_COLOR
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.h (274529 => 274530)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.h 2021-03-16 23:02:23 UTC (rev 274529)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.h 2021-03-16 23:02:47 UTC (rev 274530)
@@ -186,8 +186,6 @@
void paintMenuListButtonDecorationsWithFormControlRefresh(const RenderBox&, const PaintInfo&, const FloatRect&);
#endif
- void adjustPressedStyle(RenderStyle&, const Element&) const;
-
FloatRect addRoundedBorderClip(const RenderObject& box, GraphicsContext&, const IntRect&);
Color systemColor(CSSValueID, OptionSet<StyleColor::Options>) const override;
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (274529 => 274530)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2021-03-16 23:02:23 UTC (rev 274529)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2021-03-16 23:02:47 UTC (rev 274530)
@@ -343,19 +343,8 @@
return border.rect();
}
-void RenderThemeIOS::adjustPressedStyle(RenderStyle& style, const Element& element) const
+void RenderThemeIOS::adjustCheckboxStyle(RenderStyle& style, const Element*) const
{
-#if ENABLE(IOS_FORM_CONTROL_REFRESH)
- if (element.document().settings().iOSFormControlRefreshEnabled() && element.active())
- style.setOpacity(0.75f);
-#endif
-}
-
-void RenderThemeIOS::adjustCheckboxStyle(RenderStyle& style, const Element* element) const
-{
- if (element)
- adjustPressedStyle(style, *element);
-
if (!style.width().isIntrinsicOrAuto() && !style.height().isAuto())
return;
@@ -496,11 +485,8 @@
return RenderTheme::isControlStyled(style, userAgentStyle);
}
-void RenderThemeIOS::adjustRadioStyle(RenderStyle& style, const Element* element) const
+void RenderThemeIOS::adjustRadioStyle(RenderStyle& style, const Element*) const
{
- if (element)
- adjustPressedStyle(style, *element);
-
if (!style.width().isIntrinsicOrAuto() && !style.height().isAuto())
return;
@@ -710,8 +696,6 @@
if (!element)
return;
- adjustPressedStyle(style, *element);
-
// Enforce some default styles in the case that this is a non-multiple <select> element,
// or a date input. We don't force these if this is just an element with
// "-webkit-appearance: menulist-button".
@@ -1124,8 +1108,6 @@
if (!element)
return;
- adjustPressedStyle(style, *element);
-
RenderBox* box = element->renderBox();
if (!box)
return;
