Changeset 294640 in webkit

Timestamp:

May 23, 2022, 7:58:55 AM (3 years ago)

Author:

ntim@apple.com

Message:

Remove RenderTheme::adjustSearchFieldDecorationStyle()
​https://bugs.webkit.org/show_bug.cgi?id=240798

Reviewed by Antti Koivisto.

Let appearance: auto; handle this instead, to centralize this in one place.

• Source/WebCore/rendering/RenderTheme.cpp:

(WebCore::RenderTheme::adjustStyle):
(WebCore::RenderTheme::autoAppearanceForElement const):
(WebCore::RenderTheme::adjustSearchFieldDecorationStyle const): Deleted.

• Source/WebCore/rendering/RenderTheme.h:

Canonical link: ​https://commits.webkit.org/250864@main

Location:

trunk/Source/WebCore/rendering

Files:

• RenderTheme.cpp (modified) (3 diffs)
• RenderTheme.h (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -307 +307 @@
         return adjustSearchFieldCancelButtonStyle(style, element);
     case SearchFieldDecorationPart:
+        return adjustSearchFieldDecorationPartStyle(style, element);
     case SearchFieldResultsDecorationPart:
+        return adjustSearchFieldResultsDecorationPartStyle(style, element);
     case SearchFieldResultsButtonPart:
-        return adjustSearchFieldDecorationStyle(style, element);
+        return adjustSearchFieldResultsButtonStyle(style, element);
     case ProgressBarPart:
         return adjustProgressBarStyle(style, element);
@@ -427 +429 @@
             return SearchFieldCancelButtonPart;
 
-        if (pseudo == ShadowPseudoIds::webkitSearchDecoration())
-            return SearchFieldDecorationPart;
-
-        if (pseudo == ShadowPseudoIds::webkitSearchResultsDecoration())
-            return SearchFieldResultsDecorationPart;
-
-        if (pseudo == ShadowPseudoIds::webkitSearchResultsButton())
-            return SearchFieldResultsButtonPart;
+        if (is<SearchFieldResultsButtonElement>(element)) {
+            if (!downcast<SearchFieldResultsButtonElement>(element.get()).canAdjustStyleForAppearance())
+                return NoControlPart;
+
+            if (pseudo == ShadowPseudoIds::webkitSearchDecoration())
+                return SearchFieldDecorationPart;
+
+            if (pseudo == ShadowPseudoIds::webkitSearchResultsDecoration())
+                return SearchFieldResultsDecorationPart;
+
+            if (pseudo == ShadowPseudoIds::webkitSearchResultsButton())
+                return SearchFieldResultsButtonPart;
+        }
 
         if (pseudo == ShadowPseudoIds::webkitSliderThumb() || pseudo == ShadowPseudoIds::webkitMediaSliderThumb())
@@ -444 +451 @@
 
     return NoControlPart;
-}
-
-void RenderTheme::adjustSearchFieldDecorationStyle(RenderStyle& style, const Element* element) const
-{
-    if (is<SearchFieldResultsButtonElement>(element) && !downcast<SearchFieldResultsButtonElement>(*element).canAdjustStyleForAppearance()) {
-        style.setEffectiveAppearance(NoControlPart);
-        return;
-    }
-
-    switch (style.effectiveAppearance()) {
-    case SearchFieldDecorationPart:
-        return adjustSearchFieldDecorationPartStyle(style, element);
-    case SearchFieldResultsDecorationPart:
-        return adjustSearchFieldResultsDecorationPartStyle(style, element);
-    case SearchFieldResultsButtonPart:
-        return adjustSearchFieldResultsButtonStyle(style, element);
-    default:
-        break;
-    }
 }
 

trunk/Source/WebCore/rendering/RenderTheme.h

@@ -450 +450 @@
     ControlPart adjustAppearanceForElement(RenderStyle&, const Element*, ControlPart) const;
 
-    void adjustSearchFieldDecorationStyle(RenderStyle&, const Element*) const;
-
     mutable HashMap<uint8_t, ColorCache, DefaultHash<uint8_t>, WTF::UnsignedWithZeroKeyHashTraits<uint8_t>> m_colorCacheMap;
 };