Title: [295215] trunk/Source/WebCore
Revision
295215
Author
commit-qu...@webkit.org
Date
2022-06-03 09:30:27 -0700 (Fri, 03 Jun 2022)

Log Message

Remove last remnants of old Media Controls related sliders
https://bugs.webkit.org/show_bug.cgi?id=241226

Patch by Philippe Normand <ph...@igalia.com> on 2022-06-03
Reviewed by Tim Nguyen.

The `media-*-slider-*part` theme parts are no longer used, so should be removed.

* Source/WebCore/WebCore.order:
* Source/WebCore/accessibility/AccessibilitySlider.cpp:
(WebCore::AccessibilitySlider::orientation const):
* Source/WebCore/css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
* Source/WebCore/css/CSSValueKeywords.in:
* Source/WebCore/css/mediaControls.css:
(:is(audio, video)::-webkit-media-controls-timeline):
* Source/WebCore/css/parser/CSSParserFastPaths.cpp:
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
* Source/WebCore/html/RangeInputType.cpp:
(WebCore::RangeInputType::handleKeydownEvent):
* Source/WebCore/html/shadow/ShadowPseudoIds.cpp:
(WebCore::ShadowPseudoIds::webkitMediaSliderThumb): Deleted.
(WebCore::ShadowPseudoIds::webkitMediaSliderContainer): Deleted.
* Source/WebCore/html/shadow/ShadowPseudoIds.h:
* Source/WebCore/html/shadow/SliderThumbElement.cpp:
(WebCore::hasVerticalAppearance):
(WebCore::SliderThumbElement::create):
(WebCore::SliderThumbElement::resolveCustomStyle):
(WebCore::SliderContainerElement::create):
(WebCore::SliderThumbElement::shadowPseudoId const): Deleted.
(WebCore::SliderContainerElement::resolveCustomStyle): Deleted.
(WebCore::SliderContainerElement::shadowPseudoId const): Deleted.
* Source/WebCore/html/shadow/SliderThumbElement.h:
(WebCore::SliderThumbElement::create): Deleted.
* Source/WebCore/platform/ThemeTypes.cpp:
(WebCore::operator<<):
* Source/WebCore/platform/ThemeTypes.h:
* Source/WebCore/rendering/RenderTheme.cpp:
(WebCore::RenderTheme::adjustStyle):
(WebCore::RenderTheme::autoAppearanceForElement const):
(WebCore::RenderTheme::paint):
* Source/WebCore/rendering/RenderTheme.h:
(WebCore::RenderTheme::paintMediaSliderTrack): Deleted.
(WebCore::RenderTheme::paintMediaSliderThumb): Deleted.
(WebCore::RenderTheme::paintMediaVolumeSliderTrack): Deleted.
(WebCore::RenderTheme::paintMediaVolumeSliderThumb): Deleted.
(WebCore::RenderTheme::paintMediaFullScreenVolumeSliderTrack): Deleted.
(WebCore::RenderTheme::paintMediaFullScreenVolumeSliderThumb): Deleted.
* Source/WebCore/rendering/RenderThemeAdwaita.cpp:
(WebCore::parentMediaElement): Deleted.
(WebCore::RenderThemeAdwaita::paintMediaSliderTrack): Deleted.
(WebCore::RenderThemeAdwaita::paintMediaVolumeSliderTrack): Deleted.
* Source/WebCore/rendering/RenderThemeAdwaita.h:
* Source/WebCore/rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintSliderTrack):

Canonical link: https://commits.webkit.org/251272@main

Modified Paths

Diff

Modified: trunk/Source/WebCore/WebCore.order (295214 => 295215)


--- trunk/Source/WebCore/WebCore.order	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/WebCore.order	2022-06-03 16:30:27 UTC (rev 295215)
@@ -19175,11 +19175,7 @@
 __ZNK7WebCore39MediaControlTimeRemainingDisplayElement14shadowPseudoIdEv
 __ZN7WebCore35RenderMediaControlTimelineContainer6layoutEv
 __ZN7WebCore36MediaControlTimelineContainerElement21setTimeDisplaysHiddenEb
-__ZN7WebCore14RenderThemeMac21paintMediaSliderTrackEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE
 __ZN7WebCoreL38getUnzoomedRectAndAdjustCurrentContextEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE
-__ZN7WebCore14RenderThemeMac21paintMediaSliderThumbEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE
-__ZN7WebCore14RenderThemeMac26paintMediaFullscreenButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE
-__ZN7WebCore14RenderThemeMac20paintMediaMuteButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE
 __ZN7WebCore13MediaControls37refreshClosedCaptionsButtonVisibilityEv
 __ZN7WebCore13MediaControls19bufferingProgressedEv
 __ZThn144_NK7WebCore16HTMLMediaElement6pausedEv

Modified: trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp (295214 => 295215)


--- trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp	2022-06-03 16:30:27 UTC (rev 295215)
@@ -70,13 +70,10 @@
     switch (styleAppearance) {
     case SliderThumbHorizontalPart:
     case SliderHorizontalPart:
-    case MediaSliderPart:
-    case MediaFullScreenVolumeSliderPart:
         return AccessibilityOrientation::Horizontal;
     
     case SliderThumbVerticalPart: 
     case SliderVerticalPart:
-    case MediaVolumeSliderPart:
         return AccessibilityOrientation::Vertical;
         
     default:

Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (295214 => 295215)


--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h	2022-06-03 16:30:27 UTC (rev 295215)
@@ -472,15 +472,6 @@
     case ListboxPart:
         m_value.valueID = CSSValueListbox;
         break;
-    case MediaSliderPart:
-        m_value.valueID = CSSValueMediaSlider;
-        break;
-    case MediaVolumeSliderPart:
-        m_value.valueID = CSSValueMediaVolumeSlider;
-        break;
-    case MediaFullScreenVolumeSliderPart:
-        m_value.valueID = CSSValueMediaFullscreenVolumeSlider;
-        break;
     case MenulistPart:
         m_value.valueID = CSSValueMenulist;
         break;
@@ -532,9 +523,6 @@
 #if ENABLE(DATALIST_ELEMENT)
     case ListButtonPart:
 #endif
-    case MediaFullScreenVolumeSliderThumbPart:
-    case MediaSliderThumbPart:
-    case MediaVolumeSliderThumbPart:
     case SearchFieldDecorationPart:
     case SearchFieldResultsDecorationPart:
     case SearchFieldResultsButtonPart:

Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (295214 => 295215)


--- trunk/Source/WebCore/css/CSSValueKeywords.in	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in	2022-06-03 16:30:27 UTC (rev 295215)
@@ -841,9 +841,6 @@
 button
 default-button
 listbox
-media-fullscreen-volume-slider
-media-slider
-media-volume-slider
 menulist
 menulist-button
 meter

Modified: trunk/Source/WebCore/css/mediaControls.css (295214 => 295215)


--- trunk/Source/WebCore/css/mediaControls.css	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/css/mediaControls.css	2022-06-03 16:30:27 UTC (rev 295215)
@@ -97,7 +97,6 @@
 }
 
 :is(audio, video)::-webkit-media-controls-timeline {
-    appearance: media-slider;
     display: flex;
     flex: 1 1;
     height: 16px;

Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (295214 => 295215)


--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp	2022-06-03 16:30:27 UTC (rev 295215)
@@ -747,9 +747,6 @@
     case CSSPropertyVisibility: // visible | hidden | collapse
         return valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueCollapse;
     case CSSPropertyAppearance: {
-        if (valueID == CSSValueMediaSlider || valueID == CSSValueMediaVolumeSlider || valueID == CSSValueMediaFullscreenVolumeSlider)
-            return isUASheetBehavior(context.mode);
-
         if (valueID == CSSValueDefaultButton)
             return context.useSystemAppearance;
 

Modified: trunk/Source/WebCore/html/RangeInputType.cpp (295214 => 295215)


--- trunk/Source/WebCore/html/RangeInputType.cpp	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/html/RangeInputType.cpp	2022-06-03 16:30:27 UTC (rev 295215)
@@ -218,10 +218,8 @@
     const Decimal bigStep = std::max((stepRange.maximum() - stepRange.minimum()) / 10, step);
 
     bool isVertical = false;
-    if (auto* renderer = element()->renderer()) {
-        ControlPart part = renderer->style().effectiveAppearance();
-        isVertical = part == SliderVerticalPart || part == MediaVolumeSliderPart;
-    }
+    if (auto* renderer = element()->renderer())
+        isVertical = renderer->style().effectiveAppearance() == SliderVerticalPart;
 
     Decimal newValue;
     if (key == "Up")

Modified: trunk/Source/WebCore/html/shadow/ShadowPseudoIds.cpp (295214 => 295215)


--- trunk/Source/WebCore/html/shadow/ShadowPseudoIds.cpp	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/html/shadow/ShadowPseudoIds.cpp	2022-06-03 16:30:27 UTC (rev 295215)
@@ -141,18 +141,6 @@
     return webkitListButton;
 }
 
-const AtomString& webkitMediaSliderThumb()
-{
-    static MainThreadNeverDestroyed<const AtomString> webkitMediaSliderThumb("-webkit-media-slider-thumb"_s);
-    return webkitMediaSliderThumb;
-}
-
-const AtomString& webkitMediaSliderContainer()
-{
-    static MainThreadNeverDestroyed<const AtomString> webkitMediaSliderContainer("-webkit-media-slider-container"_s);
-    return webkitMediaSliderContainer;
-}
-
 const AtomString& webkitMediaTextTrackContainer()
 {
     static MainThreadNeverDestroyed<const AtomString> webkitMediaTextTrackContainer("-webkit-media-text-track-container"_s);

Modified: trunk/Source/WebCore/html/shadow/ShadowPseudoIds.h (295214 => 295215)


--- trunk/Source/WebCore/html/shadow/ShadowPseudoIds.h	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/html/shadow/ShadowPseudoIds.h	2022-06-03 16:30:27 UTC (rev 295215)
@@ -60,9 +60,6 @@
 
 const AtomString& webkitListButton();
 
-const AtomString& webkitMediaSliderThumb();
-const AtomString& webkitMediaSliderContainer();
-
 const AtomString& webkitMediaTextTrackContainer();
 
 const AtomString& webkitMediaTextTrackDisplay();

Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (295214 => 295215)


--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp	2022-06-03 16:30:27 UTC (rev 295215)
@@ -74,14 +74,7 @@
 inline static bool hasVerticalAppearance(HTMLInputElement& input)
 {
     ASSERT(input.renderer());
-    const RenderStyle& sliderStyle = input.renderer()->style();
-
-#if ENABLE(VIDEO)
-    if (sliderStyle.effectiveAppearance() == MediaVolumeSliderPart)
-        return true;
-#endif
-
-    return sliderStyle.effectiveAppearance() == SliderVerticalPart;
+    return input.renderer()->style().effectiveAppearance() == SliderVerticalPart;
 }
 
 // --------------------------------
@@ -177,6 +170,13 @@
 
 // --------------------------------
 
+Ref<SliderThumbElement> SliderThumbElement::create(Document& document)
+{
+    auto element = adoptRef(*new SliderThumbElement(document));
+    element->setPseudo(ShadowPseudoIds::webkitSliderThumb());
+    return element;
+}
+
 SliderThumbElement::SliderThumbElement(Document& document)
     : HTMLDivElement(HTMLNames::divTag, document)
 {
@@ -555,28 +555,8 @@
     if (!hostStyle)
         return std::nullopt;
 
-    switch (hostStyle->effectiveAppearance()) {
-    case MediaSliderPart:
-    case MediaVolumeSliderPart:
-    case MediaFullScreenVolumeSliderPart:
-        m_shadowPseudoId = ShadowPseudoIds::webkitMediaSliderThumb();
-        break;
-    default:
-        m_shadowPseudoId = ShadowPseudoIds::webkitSliderThumb();
-        break;
-    }
-
     auto elementStyle = resolveStyle(resolutionContext);
     switch (hostStyle->effectiveAppearance()) {
-    case MediaSliderPart:
-        elementStyle.renderStyle->setEffectiveAppearance(MediaSliderThumbPart);
-        break;
-    case MediaVolumeSliderPart:
-        elementStyle.renderStyle->setEffectiveAppearance(MediaVolumeSliderThumbPart);
-        break;
-    case MediaFullScreenVolumeSliderPart:
-        elementStyle.renderStyle->setEffectiveAppearance(MediaFullScreenVolumeSliderThumbPart);
-        break;
     case SliderVerticalPart:
         elementStyle.renderStyle->setEffectiveAppearance(SliderThumbVerticalPart);
         break;
@@ -590,11 +570,6 @@
     return elementStyle;
 }
 
-const AtomString& SliderThumbElement::shadowPseudoId() const
-{
-    return m_shadowPseudoId;
-}
-
 Ref<Element> SliderThumbElement::cloneElementWithoutAttributesAndChildren(Document& targetDocument)
 {
     return create(targetDocument);
@@ -610,7 +585,9 @@
 
 Ref<SliderContainerElement> SliderContainerElement::create(Document& document)
 {
-    return adoptRef(*new SliderContainerElement(document));
+    auto element = adoptRef(*new SliderContainerElement(document));
+    element->setPseudo(ShadowPseudoIds::webkitSliderContainer());
+    return element;
 }
 
 RenderPtr<RenderElement> SliderContainerElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
@@ -618,29 +595,4 @@
     return createRenderer<RenderSliderContainer>(*this, WTFMove(style));
 }
 
-std::optional<Style::ElementStyle> SliderContainerElement::resolveCustomStyle(const Style::ResolutionContext&, const RenderStyle* hostStyle)
-{
-    // This doesn't actually compute style. This is just a hack to pick shadow pseudo id when host style is known.
-
-    if (!hostStyle)
-        return std::nullopt;
-
-    switch (hostStyle->effectiveAppearance()) {
-    case MediaSliderPart:
-    case MediaVolumeSliderPart:
-    case MediaFullScreenVolumeSliderPart:
-        m_shadowPseudoId = ShadowPseudoIds::webkitMediaSliderContainer();
-        break;
-    default:
-        m_shadowPseudoId = ShadowPseudoIds::webkitSliderContainer();
-    }
-
-    return std::nullopt;
 }
-
-const AtomString& SliderContainerElement::shadowPseudoId() const
-{
-    return m_shadowPseudoId;
-}
-
-}

Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.h (295214 => 295215)


--- trunk/Source/WebCore/html/shadow/SliderThumbElement.h	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.h	2022-06-03 16:30:27 UTC (rev 295215)
@@ -74,7 +74,6 @@
     void willDetachRenderers() final;
 
     std::optional<Style::ElementStyle> resolveCustomStyle(const Style::ResolutionContext&, const RenderStyle*) final;
-    const AtomString& shadowPseudoId() const final;
 
     void startDragging();
     void stopDragging();
@@ -105,11 +104,6 @@
 #endif
 };
 
-inline Ref<SliderThumbElement> SliderThumbElement::create(Document& document)
-{
-    return adoptRef(*new SliderThumbElement(document));
-}
-
 // --------------------------------
 
 class SliderContainerElement final : public HTMLDivElement {
@@ -120,11 +114,7 @@
 private:
     SliderContainerElement(Document&);
     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
-    std::optional<Style::ElementStyle> resolveCustomStyle(const Style::ResolutionContext&, const RenderStyle*) final;
-    const AtomString& shadowPseudoId() const final;
     bool isSliderContainerElement() const final { return true; }
-
-    AtomString m_shadowPseudoId;
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/platform/ThemeTypes.cpp (295214 => 295215)


--- trunk/Source/WebCore/platform/ThemeTypes.cpp	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/platform/ThemeTypes.cpp	2022-06-03 16:30:27 UTC (rev 295215)
@@ -43,12 +43,6 @@
     case DefaultButtonPart: ts << "default-button-part"; break;
     case InnerSpinButtonPart: ts << "inner-spin-button-part"; break;
     case ListboxPart: ts << "listbox-part"; break;
-    case MediaFullScreenVolumeSliderPart: ts << "media-full-screen-volume-slider-part"; break;
-    case MediaFullScreenVolumeSliderThumbPart: ts << "media-full-screen-volume-slider-thumb-part"; break;
-    case MediaSliderPart: ts << "media-slider-part"; break;
-    case MediaSliderThumbPart: ts << "media-slider-thumb-part"; break;
-    case MediaVolumeSliderPart: ts << "media-volume-slider-part"; break;
-    case MediaVolumeSliderThumbPart: ts << "media-volume-slider-thumb-part"; break;
     case MenulistPart: ts << "menulist-part"; break;
     case MenulistButtonPart: ts << "menulist-button-part"; break;
     case MeterPart: ts << "meter-part"; break;

Modified: trunk/Source/WebCore/platform/ThemeTypes.h (295214 => 295215)


--- trunk/Source/WebCore/platform/ThemeTypes.h	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/platform/ThemeTypes.h	2022-06-03 16:30:27 UTC (rev 295215)
@@ -42,9 +42,6 @@
     ButtonPart,
     DefaultButtonPart,
     ListboxPart,
-    MediaFullScreenVolumeSliderPart,
-    MediaSliderPart,
-    MediaVolumeSliderPart,
     MenulistPart,
     MenulistButtonPart,
     MeterPart,
@@ -73,9 +70,6 @@
 #if ENABLE(DATALIST_ELEMENT)
     ListButtonPart,
 #endif
-    MediaFullScreenVolumeSliderThumbPart,
-    MediaSliderThumbPart,
-    MediaVolumeSliderThumbPart,
     SearchFieldDecorationPart,
     SearchFieldResultsDecorationPart,
     SearchFieldResultsButtonPart,

Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (295214 => 295215)


--- trunk/Source/WebCore/rendering/RenderTheme.cpp	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp	2022-06-03 16:30:27 UTC (rev 295215)
@@ -292,9 +292,6 @@
         return adjustMenuListStyle(style, element);
     case MenulistButtonPart:
         return adjustMenuListButtonStyle(style, element);
-    case MediaSliderPart:
-    case MediaVolumeSliderPart:
-    case MediaFullScreenVolumeSliderPart:
     case SliderHorizontalPart:
     case SliderVerticalPart:
         return adjustSliderTrackStyle(style, element);
@@ -438,7 +435,7 @@
                 return SearchFieldResultsButtonPart;
         }
 
-        if (pseudo == ShadowPseudoIds::webkitSliderThumb() || pseudo == ShadowPseudoIds::webkitMediaSliderThumb())
+        if (pseudo == ShadowPseudoIds::webkitSliderThumb())
             return SliderThumbHorizontalPart;
 
         if (pseudo == ShadowPseudoIds::webkitInnerSpinButton())
@@ -524,18 +521,6 @@
     case SliderThumbHorizontalPart:
     case SliderThumbVerticalPart:
         return paintSliderThumb(box, paintInfo, integralSnappedRect);
-    case MediaSliderPart:
-        return paintMediaSliderTrack(box, paintInfo, integralSnappedRect);
-    case MediaSliderThumbPart:
-        return paintMediaSliderThumb(box, paintInfo, integralSnappedRect);
-    case MediaVolumeSliderPart:
-        return paintMediaVolumeSliderTrack(box, paintInfo, integralSnappedRect);
-    case MediaVolumeSliderThumbPart:
-        return paintMediaVolumeSliderThumb(box, paintInfo, integralSnappedRect);
-    case MediaFullScreenVolumeSliderPart:
-        return paintMediaFullScreenVolumeSliderTrack(box, paintInfo, integralSnappedRect);
-    case MediaFullScreenVolumeSliderThumbPart:
-        return paintMediaFullScreenVolumeSliderThumb(box, paintInfo, integralSnappedRect);
     case MenulistButtonPart:
     case TextFieldPart:
     case TextAreaPart:

Modified: trunk/Source/WebCore/rendering/RenderTheme.h (295214 => 295215)


--- trunk/Source/WebCore/rendering/RenderTheme.h	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/rendering/RenderTheme.h	2022-06-03 16:30:27 UTC (rev 295215)
@@ -377,13 +377,6 @@
     virtual void adjustSearchFieldResultsButtonStyle(RenderStyle&, const Element*) const;
     virtual bool paintSearchFieldResultsButton(const RenderBox&, const PaintInfo&, const IntRect&) { return true; }
 
-    virtual bool paintMediaSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
-    virtual bool paintMediaSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
-    virtual bool paintMediaVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
-    virtual bool paintMediaVolumeSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
-    virtual bool paintMediaFullScreenVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
-    virtual bool paintMediaFullScreenVolumeSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
-
 public:
     void updateControlStatesForRenderer(const RenderBox&, ControlStates&) const;
     OptionSet<ControlStates::States> extractControlStatesForRenderer(const RenderObject&) const;

Modified: trunk/Source/WebCore/rendering/RenderThemeAdwaita.cpp (295214 => 295215)


--- trunk/Source/WebCore/rendering/RenderThemeAdwaita.cpp	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/rendering/RenderThemeAdwaita.cpp	2022-06-03 16:30:27 UTC (rev 295215)
@@ -658,98 +658,6 @@
     return false;
 }
 
-#if ENABLE(VIDEO)
-static RefPtr<HTMLMediaElement> parentMediaElement(const Node* node)
-{
-    if (!node)
-        return nullptr;
-    RefPtr<Node> mediaNode = node->shadowHost();
-    if (!mediaNode)
-        mediaNode = const_cast<Node*>(node);
-    if (!is<HTMLMediaElement>(*mediaNode))
-        return nullptr;
-    return downcast<HTMLMediaElement>(mediaNode.get());
-}
-
-bool RenderThemeAdwaita::paintMediaSliderTrack(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    auto mediaElement = parentMediaElement(renderObject.node());
-    if (!mediaElement)
-        return false;
-
-    auto& graphicsContext = paintInfo.context();
-    GraphicsContextStateSaver stateSaver(graphicsContext);
-
-    FloatRect trackRect = rect;
-    FloatSize corner(2, 2);
-    Path path;
-    path.addRoundedRect(trackRect, corner);
-    graphicsContext.setFillColor(mediaSliderTrackBackgroundcolor);
-    graphicsContext.fillPath(path);
-    path.clear();
-
-    graphicsContext.setFillColor(mediaSliderTrackBufferedColor);
-
-    float mediaDuration = mediaElement->duration();
-    RefPtr<TimeRanges> timeRanges = mediaElement->buffered();
-    for (unsigned index = 0; index < timeRanges->length(); ++index) {
-        float start = timeRanges->start(index).releaseReturnValue();
-        float end = timeRanges->end(index).releaseReturnValue();
-        float startRatio = start / mediaDuration;
-        float lengthRatio = (end - start) / mediaDuration;
-        if (!lengthRatio)
-            continue;
-
-        FloatRect rangeRect = rect;
-        rangeRect.setWidth(lengthRatio * rect.width());
-        if (index)
-            rangeRect.move(startRatio * rect.width(), 0);
-
-        path.addRoundedRect(rangeRect, corner);
-        graphicsContext.fillPath(path);
-        path.clear();
-    }
-
-    FloatRect playedRect = rect;
-    playedRect.setWidth((mediaElement->currentTime() / mediaDuration) * rect.width());
-    graphicsContext.setFillColor(mediaSliderTrackActiveColor);
-    path.addRoundedRect(playedRect, corner);
-    graphicsContext.fillPath(path);
-
-    return false;
-}
-
-bool RenderThemeAdwaita::paintMediaVolumeSliderTrack(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    auto mediaElement = parentMediaElement(renderObject.node());
-    if (!mediaElement)
-        return false;
-
-    auto& graphicsContext = paintInfo.context();
-    GraphicsContextStateSaver stateSaver(graphicsContext);
-
-    FloatRect trackRect = rect;
-    FloatSize corner(2, 2);
-    Path path;
-    path.addRoundedRect(trackRect, corner);
-    graphicsContext.setFillColor(mediaSliderTrackBackgroundcolor);
-    graphicsContext.fillPath(path);
-    path.clear();
-
-    float volume = mediaElement->muted() ? 0.0f : mediaElement->volume();
-    if (volume) {
-        FloatRect volumeRect = rect;
-        volumeRect.setHeight(volumeRect.height() * volume);
-        volumeRect.move(0, rect.height() - volumeRect.height());
-        path.addRoundedRect(volumeRect, corner);
-        graphicsContext.setFillColor(mediaSliderTrackActiveColor);
-        graphicsContext.fillPath(path);
-    }
-
-    return false;
-}
-#endif // ENABLE(VIDEO)
-
 #if ENABLE(DATALIST_ELEMENT)
 IntSize RenderThemeAdwaita::sliderTickSize() const
 {

Modified: trunk/Source/WebCore/rendering/RenderThemeAdwaita.h (295214 => 295215)


--- trunk/Source/WebCore/rendering/RenderThemeAdwaita.h	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/rendering/RenderThemeAdwaita.h	2022-06-03 16:30:27 UTC (rev 295215)
@@ -93,11 +93,6 @@
     void adjustSliderThumbSize(RenderStyle&, const Element*) const final;
     bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) final;
 
-#if ENABLE(VIDEO)
-    bool paintMediaSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) final;
-    bool paintMediaVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) final;
-#endif
-
     Color systemColor(CSSValueID, OptionSet<StyleColorOptions>) const final;
 
 #if ENABLE(DATALIST_ELEMENT)

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (295214 => 295215)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2022-06-03 16:13:00 UTC (rev 295214)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2022-06-03 16:30:27 UTC (rev 295215)
@@ -1756,7 +1756,7 @@
     float zoomLevel = o.style().effectiveZoom();
     float zoomedTrackWidth = trackWidth * zoomLevel;
 
-    if (o.style().effectiveAppearance() ==  SliderHorizontalPart || o.style().effectiveAppearance() ==  MediaSliderPart) {
+    if (o.style().effectiveAppearance() ==  SliderHorizontalPart) {
         bounds.setHeight(zoomedTrackWidth);
         bounds.setY(r.y() + r.height() / 2 - zoomedTrackWidth / 2);
     } else if (o.style().effectiveAppearance() == SliderVerticalPart) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to