Diff
Modified: trunk/Source/WebCore/ChangeLog (232454 => 232455)
--- trunk/Source/WebCore/ChangeLog 2018-06-03 22:15:21 UTC (rev 232454)
+++ trunk/Source/WebCore/ChangeLog 2018-06-03 22:24:18 UTC (rev 232455)
@@ -3,6 +3,21 @@
REGRESSION(r232338): [GTK] Broke a few layout tests
https://bugs.webkit.org/show_bug.cgi?id=186244
+ Unreviewed, also rollout r232392.
+
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::adjustStyle):
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::adjustListboxStyle const): Deleted.
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::adjustListboxStyle const): Deleted.
+ * rendering/RenderThemeGtk.h:
+
+2018-06-03 Michael Catanzaro <[email protected]>
+
+ REGRESSION(r232338): [GTK] Broke a few layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=186244
+
Unreviewed, rollout r232338.
* platform/gtk/RenderThemeGadget.cpp:
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (232454 => 232455)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2018-06-03 22:15:21 UTC (rev 232454)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2018-06-03 22:24:18 UTC (rev 232455)
@@ -213,8 +213,6 @@
return adjustMenuListStyle(styleResolver, style, element);
case MenulistButtonPart:
return adjustMenuListButtonStyle(styleResolver, style, element);
- case ListboxPart:
- return adjustListboxStyle(styleResolver, style, element);
case MediaPlayButtonPart:
case MediaCurrentTimePart:
case MediaTimeRemainingPart:
Modified: trunk/Source/WebCore/rendering/RenderTheme.h (232454 => 232455)
--- trunk/Source/WebCore/rendering/RenderTheme.h 2018-06-03 22:15:21 UTC (rev 232454)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2018-06-03 22:24:18 UTC (rev 232455)
@@ -305,8 +305,6 @@
virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, const Element*) const;
virtual bool paintMenuListButtonDecorations(const RenderBox&, const PaintInfo&, const FloatRect&) { return true; }
- virtual void adjustListboxStyle(StyleResolver&, RenderStyle&, const Element*) const { };
-
virtual bool paintPushButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
virtual bool paintSquareButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (232454 => 232455)
--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2018-06-03 22:15:21 UTC (rev 232454)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2018-06-03 22:24:18 UTC (rev 232455)
@@ -1081,12 +1081,6 @@
}
#endif
-void RenderThemeGtk::adjustListboxStyle(StyleResolver&, RenderStyle& style, const Element* element) const
-{
- if (element)
- style.setColor(styleColor(ListBox, element->isDisabledFormControl() ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL, StyleColorForeground));
-}
-
bool RenderThemeGtk::paintTextArea(const RenderObject& o, const PaintInfo& i, const FloatRect& r)
{
return paintTextField(o, i, r);
Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.h (232454 => 232455)
--- trunk/Source/WebCore/rendering/RenderThemeGtk.h 2018-06-03 22:15:21 UTC (rev 232454)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.h 2018-06-03 22:24:18 UTC (rev 232455)
@@ -131,8 +131,6 @@
bool paintMenuList(const RenderObject&, const PaintInfo&, const FloatRect&) override;
bool paintMenuListButtonDecorations(const RenderBox&, const PaintInfo&, const FloatRect&) override;
- void adjustListboxStyle(StyleResolver&, RenderStyle&, const Element*) const override;
-
void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, const Element*) const override;
bool paintSearchFieldResultsDecorationPart(const RenderBox&, const PaintInfo&, const IntRect&) override;
