Title: [294629] trunk
Revision
294629
Author
[email protected]
Date
2022-05-23 02:06:26 -0700 (Mon, 23 May 2022)

Log Message

[css-ui] Remove media-play-button and media-volume-slider-mute appearance values
https://bugs.webkit.org/show_bug.cgi?id=240760

Reviewed by Antti Koivisto.

These are unimplemented/no-op on all platforms.

* LayoutTests/fast/css-generated-content/empty-first-letter-with-columns-crash.html:
* LayoutTests/fast/multicol/readjust-first-child-on-attach.html:
Stop using these appearance values in crashtests.

* LayoutTests/imported/blink/fast/css-generated-content/empty-first-letter-with-columns-crash.html: Removed.
Remove duplicate test.

* LayoutTests/imported/blink/media/video-webkit-appearance-expected.html: Removed.
* LayoutTests/imported/blink/media/video-webkit-appearance.html: Removed.
Remove no longer relevant crashtest.

* LayoutTests/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt:
* LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt:
Marked subtests as passing.

* Source/WebCore/css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/css/CSSValueKeywords.in:
* Source/WebCore/css/mediaControls.css:
Clean up stylesheet and stop using unsupported appearance values.
(:is(audio, video)::-webkit-media-controls-panel):
(video:-webkit-full-page-media):
(:is(audio, video)::-webkit-media-controls-mute-button,):
(:is(audio, video)::-webkit-media-controls-overlay-play-button):
(:is(audio, video)::-webkit-media-controls-timeline-container):
(:is(audio, video)::-webkit-media-controls-current-time-display,):
(:is(audio, video)::-webkit-media-controls-timeline):
(:is(audio, video)::-webkit-media-controls-volume-slider):
(:is(audio, video)::-webkit-media-controls-seek-back-button,):
(:is(audio, video)::-webkit-media-controls-rewind-button,):
(:is(audio, video)::-webkit-media-controls-closed-captions-container,):
(:is(audio, video)::-webkit-media-controls-volume-slider-mute-button):
(audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel): Deleted.
(audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button): Deleted.
(audio::-webkit-media-controls-overlay-play-button, video::-webkit-media-controls-overlay-play-button): Deleted.
(audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button): Deleted.
(audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container): Deleted.
(audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display): Deleted.
(audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display): Deleted.
(audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline): Deleted.
(audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider): Deleted.
(audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button): Deleted.
(audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button): Deleted.
(audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button): Deleted.
(audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button): Deleted.
(audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button): Deleted.
(audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button): Deleted.
(audio::-webkit-media-controls-closed-captions-container, video::-webkit-media-controls-closed-captions-container): Deleted.
(audio::-webkit-media-controls-closed-captions-track-list, video::-webkit-media-controls-closed-captions-track-list): Deleted.
(audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button): Deleted.
(audio::-webkit-media-controls-fullscreen-volume-slider, video::-webkit-media-controls-fullscreen-volume-slider): Deleted.
(audio::-webkit-media-controls-fullscreen-volume-min-button, video::-webkit-media-controls-fullscreen-volume-min-button): Deleted.
(audio::-webkit-media-controls-fullscreen-volume-max-button, video::-webkit-media-controls-fullscreen-volume-max-button): Deleted.
* Source/WebCore/platform/ThemeTypes.cpp:
(WebCore::operator<<):
* Source/WebCore/platform/ThemeTypes.h:
* Source/WebCore/rendering/RenderTheme.cpp:
(WebCore::RenderTheme::adjustStyle):
(WebCore::RenderTheme::paint):
(WebCore::RenderTheme::adjustMediaControlStyle const): Deleted.
* Source/WebCore/rendering/RenderTheme.h:
(WebCore::RenderTheme::paintMediaPlayButton): Deleted.
(WebCore::RenderTheme::paintMediaMuteButton): Deleted.
* Source/WebInspectorUI/UserInterface/External/CSSDocumentation/CSSDocumentation-overrides.json:
* Source/WebInspectorUI/UserInterface/External/CSSDocumentation/CSSDocumentation.js:

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

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/fast/css-generated-content/empty-first-letter-with-columns-crash.html (294628 => 294629)


--- trunk/LayoutTests/fast/css-generated-content/empty-first-letter-with-columns-crash.html	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/LayoutTests/fast/css-generated-content/empty-first-letter-with-columns-crash.html	2022-05-23 09:06:26 UTC (rev 294629)
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <style>
-.slider { -webkit-appearance: media-volume-slider-mute-button; }
+.slider { -webkit-appearance: slider-horizontal; }
 *:first-letter { pointer-events: fill; }
 </style>
 <body style="-webkit-column-count: 2">

Modified: trunk/LayoutTests/fast/multicol/readjust-first-child-on-attach.html (294628 => 294629)


--- trunk/LayoutTests/fast/multicol/readjust-first-child-on-attach.html	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/LayoutTests/fast/multicol/readjust-first-child-on-attach.html	2022-05-23 09:06:26 UTC (rev 294629)
@@ -1,7 +1,6 @@
 <style>
   ruby {
     columns: 1px;
-    -webkit-appearance: media-play-button;
   }
   ruby::before {
     display: block;

Deleted: trunk/LayoutTests/imported/blink/fast/css-generated-content/empty-first-letter-with-columns-crash.html (294628 => 294629)


--- trunk/LayoutTests/imported/blink/fast/css-generated-content/empty-first-letter-with-columns-crash.html	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/LayoutTests/imported/blink/fast/css-generated-content/empty-first-letter-with-columns-crash.html	2022-05-23 09:06:26 UTC (rev 294629)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<style>
-.slider { -webkit-appearance: media-volume-slider-mute-button; }
-*:first-letter { pointer-events: fill; }
-</style>
-<body style="-webkit-column-count: 2">
-    <div>
-        <button></button>
-        <table id="table" style="-webkit-column-span: all"></table>
-    </div>
-<script>
-document.body.offsetHeight;
-document.body.appendChild(document.createElement('div'));
-document.getElementById('table').className = 'slider'
-
-if (window.testRunner)
-    testRunner.dumpAsText();
-
-document.write("PASS. Test didn't crash.");
-</script>
-</body>

Deleted: trunk/LayoutTests/imported/blink/media/video-webkit-appearance-expected.html (294628 => 294629)


--- trunk/LayoutTests/imported/blink/media/video-webkit-appearance-expected.html	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/LayoutTests/imported/blink/media/video-webkit-appearance-expected.html	2022-05-23 09:06:26 UTC (rev 294629)
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<title>video with -webkit-appearance media-play-button</title>
-<script src=""
-<video></video>
-<script>
-var video = document.querySelector('video');
-video.src = "" 'content/test');
-
-if (window.testRunner) {
-  testRunner.waitUntilDone();
-  video.addEventListener('loadedmetadata', function() {
-    testRunner.notifyDone();
-  });
-}
-</script>

Deleted: trunk/LayoutTests/imported/blink/media/video-webkit-appearance.html (294628 => 294629)


--- trunk/LayoutTests/imported/blink/media/video-webkit-appearance.html	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/LayoutTests/imported/blink/media/video-webkit-appearance.html	2022-05-23 09:06:26 UTC (rev 294629)
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<title>video with -webkit-appearance media-play-button</title>
-<script src=""
-<style>
-video {
-  -webkit-appearance: media-play-button;
-}
-</style>
-<video></video>
-<script>
-var video = document.querySelector('video');
-video.src = "" 'content/test');
-
-if (window.testRunner) {
-  testRunner.waitUntilDone();
-  video.addEventListener('loadedmetadata', function() {
-    testRunner.notifyDone();
-  });
-}
-</script>

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt (294628 => 294629)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt	2022-05-23 09:06:26 UTC (rev 294629)
@@ -51,7 +51,7 @@
 FAIL -webkit-appearance: media-fullscreen-volume-slider-thumb (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-fullscreen-volume-slider-thumb"
 PASS -webkit-appearance: media-mute-button (invalid)
 PASS -webkit-appearance: media-overlay-play-button (invalid)
-FAIL -webkit-appearance: media-play-button (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-play-button"
+PASS -webkit-appearance: media-play-button (invalid)
 PASS -webkit-appearance: media-return-to-realtime-button (invalid)
 PASS -webkit-appearance: media-rewind-button (invalid)
 PASS -webkit-appearance: media-seek-back-button (invalid)
@@ -62,7 +62,7 @@
 PASS -webkit-appearance: media-toggle-closed-captions-button (invalid)
 FAIL -webkit-appearance: media-volume-slider (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-volume-slider"
 PASS -webkit-appearance: media-volume-slider-container (invalid)
-FAIL -webkit-appearance: media-volume-slider-mute-button (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-volume-slider-mute-button"
+PASS -webkit-appearance: media-volume-slider-mute-button (invalid)
 FAIL -webkit-appearance: media-volume-sliderthumb (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-volume-sliderthumb"
 PASS -webkit-appearance: menuarrow (invalid)
 PASS -webkit-appearance: menubar (invalid)
@@ -214,7 +214,7 @@
 FAIL appearance: media-fullscreen-volume-slider-thumb (invalid) assert_equals: style.appearance expected "" but got "media-fullscreen-volume-slider-thumb"
 PASS appearance: media-mute-button (invalid)
 PASS appearance: media-overlay-play-button (invalid)
-FAIL appearance: media-play-button (invalid) assert_equals: style.appearance expected "" but got "media-play-button"
+PASS appearance: media-play-button (invalid)
 PASS appearance: media-return-to-realtime-button (invalid)
 PASS appearance: media-rewind-button (invalid)
 PASS appearance: media-seek-back-button (invalid)
@@ -225,7 +225,7 @@
 PASS appearance: media-toggle-closed-captions-button (invalid)
 FAIL appearance: media-volume-slider (invalid) assert_equals: style.appearance expected "" but got "media-volume-slider"
 PASS appearance: media-volume-slider-container (invalid)
-FAIL appearance: media-volume-slider-mute-button (invalid) assert_equals: style.appearance expected "" but got "media-volume-slider-mute-button"
+PASS appearance: media-volume-slider-mute-button (invalid)
 FAIL appearance: media-volume-sliderthumb (invalid) assert_equals: style.appearance expected "" but got "media-volume-sliderthumb"
 PASS appearance: menuarrow (invalid)
 PASS appearance: menubar (invalid)

Modified: trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt (294628 => 294629)


--- trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt	2022-05-23 09:06:26 UTC (rev 294629)
@@ -51,7 +51,7 @@
 FAIL -webkit-appearance: media-fullscreen-volume-slider-thumb (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-fullscreen-volume-slider-thumb"
 PASS -webkit-appearance: media-mute-button (invalid)
 PASS -webkit-appearance: media-overlay-play-button (invalid)
-FAIL -webkit-appearance: media-play-button (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-play-button"
+PASS -webkit-appearance: media-play-button (invalid)
 PASS -webkit-appearance: media-return-to-realtime-button (invalid)
 PASS -webkit-appearance: media-rewind-button (invalid)
 PASS -webkit-appearance: media-seek-back-button (invalid)
@@ -62,7 +62,7 @@
 PASS -webkit-appearance: media-toggle-closed-captions-button (invalid)
 FAIL -webkit-appearance: media-volume-slider (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-volume-slider"
 PASS -webkit-appearance: media-volume-slider-container (invalid)
-FAIL -webkit-appearance: media-volume-slider-mute-button (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-volume-slider-mute-button"
+PASS -webkit-appearance: media-volume-slider-mute-button (invalid)
 FAIL -webkit-appearance: media-volume-sliderthumb (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-volume-sliderthumb"
 PASS -webkit-appearance: menuarrow (invalid)
 PASS -webkit-appearance: menubar (invalid)
@@ -214,7 +214,7 @@
 FAIL appearance: media-fullscreen-volume-slider-thumb (invalid) assert_equals: style.appearance expected "" but got "media-fullscreen-volume-slider-thumb"
 PASS appearance: media-mute-button (invalid)
 PASS appearance: media-overlay-play-button (invalid)
-FAIL appearance: media-play-button (invalid) assert_equals: style.appearance expected "" but got "media-play-button"
+PASS appearance: media-play-button (invalid)
 PASS appearance: media-return-to-realtime-button (invalid)
 PASS appearance: media-rewind-button (invalid)
 PASS appearance: media-seek-back-button (invalid)
@@ -225,7 +225,7 @@
 PASS appearance: media-toggle-closed-captions-button (invalid)
 FAIL appearance: media-volume-slider (invalid) assert_equals: style.appearance expected "" but got "media-volume-slider"
 PASS appearance: media-volume-slider-container (invalid)
-FAIL appearance: media-volume-slider-mute-button (invalid) assert_equals: style.appearance expected "" but got "media-volume-slider-mute-button"
+PASS appearance: media-volume-slider-mute-button (invalid)
 FAIL appearance: media-volume-sliderthumb (invalid) assert_equals: style.appearance expected "" but got "media-volume-sliderthumb"
 PASS appearance: menuarrow (invalid)
 PASS appearance: menubar (invalid)

Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (294628 => 294629)


--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h	2022-05-23 09:06:26 UTC (rev 294629)
@@ -472,9 +472,6 @@
     case ListboxPart:
         m_value.valueID = CSSValueListbox;
         break;
-    case MediaPlayButtonPart:
-        m_value.valueID = CSSValueMediaPlayButton;
-        break;
     case MediaSliderPart:
         m_value.valueID = CSSValueMediaSlider;
         break;
@@ -484,9 +481,6 @@
     case MediaVolumeSliderPart:
         m_value.valueID = CSSValueMediaVolumeSlider;
         break;
-    case MediaVolumeSliderMuteButtonPart:
-        m_value.valueID = CSSValueMediaVolumeSliderMuteButton;
-        break;
     case MediaVolumeSliderThumbPart:
         m_value.valueID = CSSValueMediaVolumeSliderthumb;
         break;

Modified: trunk/Source/WebCore/css/CSSProperties.json (294628 => 294629)


--- trunk/Source/WebCore/css/CSSProperties.json	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebCore/css/CSSProperties.json	2022-05-23 09:06:26 UTC (rev 294629)
@@ -5170,11 +5170,9 @@
                 "media-controls-light-bar-background",
                 "media-fullscreen-volume-slider",
                 "media-fullscreen-volume-slider-thumb",
-                "media-play-button",
                 "media-slider",
                 "media-sliderthumb",
                 "media-volume-slider",
-                "media-volume-slider-mute-button",
                 "media-volume-sliderthumb",
                 "menulist",
                 "menulist-button",

Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (294628 => 294629)


--- trunk/Source/WebCore/css/CSSValueKeywords.in	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in	2022-05-23 09:06:26 UTC (rev 294629)
@@ -845,11 +845,9 @@
 media-controls-light-bar-background
 media-fullscreen-volume-slider
 media-fullscreen-volume-slider-thumb
-media-play-button
 media-slider
 media-sliderthumb
 media-volume-slider
-media-volume-slider-mute-button
 media-volume-sliderthumb
 menulist
 menulist-button

Modified: trunk/Source/WebCore/css/mediaControls.css (294628 => 294629)


--- trunk/Source/WebCore/css/mediaControls.css	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebCore/css/mediaControls.css	2022-05-23 09:06:26 UTC (rev 294629)
@@ -41,7 +41,7 @@
     flex-direction: column;
 }
 
-audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
+:is(audio, video)::-webkit-media-controls-panel {
     display: flex;
     direction: ltr;
     flex-direction: row;
@@ -59,10 +59,7 @@
 video:-webkit-full-page-media {
     margin: auto;
     position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
+    inset: 0;
 }
 
 video:-webkit-full-page-media::-webkit-media-controls-panel {
@@ -69,8 +66,8 @@
     bottom: 0px;
 }
 
-audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
-    -webkit-appearance: media-mute-button;
+:is(audio, video)::-webkit-media-controls-mute-button,
+:is(audio, video)::-webkit-media-controls-play-button {
     display: flex;
     width: 16px;
     height: 16px;
@@ -79,23 +76,12 @@
     color: inherit;
 }
 
-audio::-webkit-media-controls-overlay-play-button, video::-webkit-media-controls-overlay-play-button {
+:is(audio, video)::-webkit-media-controls-overlay-play-button {
     display: none;
 }
 
-audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
-    -webkit-appearance: media-play-button;
+:is(audio, video)::-webkit-media-controls-timeline-container {
     display: flex;
-    width: 16px;
-    height: 16px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
-    -webkit-appearance: media-controls-background;
-    display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: flex-end;
@@ -105,15 +91,12 @@
     min-width: 0;
 }
 
-audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
+:is(audio, video)::-webkit-media-controls-current-time-display,
+:is(audio, video)::-webkit-media-controls-time-remaining-display {
     display: none;
 }
 
-audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
-    display: none;
-}
-
-audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
+:is(audio, video)::-webkit-media-controls-timeline {
     -webkit-appearance: media-slider;
     display: flex;
     flex: 1 1;
@@ -126,7 +109,7 @@
     min-width: 0;
 }
 
-audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
+:is(audio, video)::-webkit-media-controls-volume-slider {
     background-color: initial !important;
     border: initial !important;
     color: inherit !important;
@@ -133,8 +116,10 @@
     margin: initial !important;
 }
 
-audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
-    -webkit-appearance: media-seek-back-button;
+:is(audio, video)::-webkit-media-controls-seek-back-button,
+:is(audio, video)::-webkit-media-controls-seek-forward-button,
+:is(audio, video)::-webkit-media-controls-fullscreen-button,
+:is(audio, video)::-webkit-media-controls-toggle-closed-captions-button {
     display: flex;
     width: 16px;
     height: 16px;
@@ -143,27 +128,8 @@
     color: inherit;
 }
 
-audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
-    -webkit-appearance: media-seek-forward-button;
-    display: flex;
-    width: 16px;
-    height: 16px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
-    -webkit-appearance: media-enter-fullscreen-button;
-    display: flex;
-    width: 16px;
-    height: 16px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button {
+:is(audio, video)::-webkit-media-controls-rewind-button,
+:is(audio, video)::-webkit-media-controls-return-to-realtime-button {
     display: none;
     background-color: initial;
     border: initial;
@@ -170,33 +136,15 @@
     color: inherit;
 }
 
-audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button {
+:is(audio, video)::-webkit-media-controls-closed-captions-container,
+:is(audio, video)::-webkit-media-controls-closed-captions-track-list,
+:is(audio, video)::-webkit-media-controls-fullscreen-volume-slider,
+:is(audio, video)::-webkit-media-controls-fullscreen-volume-min-button,
+:is(audio, video)::-webkit-media-controls-fullscreen-volume-max-button {
     display: none;
-    background-color: initial;
-    border: initial;
-    color: inherit;
 }
 
-audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
-    -webkit-appearance: media-toggle-closed-captions-button;
-    display: flex;
-    width: 16px;
-    height: 16px;
-    background-color: initial;
-    border: initial;
-    color: inherit;
-}
-
-audio::-webkit-media-controls-closed-captions-container, video::-webkit-media-controls-closed-captions-container {
-    display: none;
-}
-
-audio::-webkit-media-controls-closed-captions-track-list, video::-webkit-media-controls-closed-captions-track-list {
-    display: none;
-}
-
-audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button {
-    -webkit-appearance: media-volume-slider-mute-button !important;
+:is(audio, video)::-webkit-media-controls-volume-slider-mute-button {
     display: none !important;
     background-color: initial !important;
     border: initial !important;
@@ -203,18 +151,6 @@
     color: inherit !important;
 }
 
-audio::-webkit-media-controls-fullscreen-volume-slider, video::-webkit-media-controls-fullscreen-volume-slider {
-    display: none;
-}
-
-audio::-webkit-media-controls-fullscreen-volume-min-button, video::-webkit-media-controls-fullscreen-volume-min-button {
-    display: none;
-}
-
-audio::-webkit-media-controls-fullscreen-volume-max-button, video::-webkit-media-controls-fullscreen-volume-max-button {
-    display: none;
-}
-
 video::-webkit-media-text-track-container {
     position: relative;
     width: 100%;

Modified: trunk/Source/WebCore/platform/ThemeTypes.cpp (294628 => 294629)


--- trunk/Source/WebCore/platform/ThemeTypes.cpp	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebCore/platform/ThemeTypes.cpp	2022-05-23 09:06:26 UTC (rev 294629)
@@ -47,11 +47,9 @@
     case MediaControlsLightBarBackgroundPart: ts << "media-controls-light-bar-background-part"; break;
     case MediaFullScreenVolumeSliderPart: ts << "media-full-screen-volume-slider-part"; break;
     case MediaFullScreenVolumeSliderThumbPart: ts << "media-full-screen-volume-slider-thumb-part"; break;
-    case MediaPlayButtonPart: ts << "media-play-button-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 MediaVolumeSliderMuteButtonPart: ts << "media-volume-slider-mute-button-part"; break;
     case MediaVolumeSliderThumbPart: ts << "media-volume-slider-thumb-part"; break;
     case MenulistPart: ts << "menulist-part"; break;
     case MenulistButtonPart: ts << "menulist-button-part"; break;

Modified: trunk/Source/WebCore/platform/ThemeTypes.h (294628 => 294629)


--- trunk/Source/WebCore/platform/ThemeTypes.h	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebCore/platform/ThemeTypes.h	2022-05-23 09:06:26 UTC (rev 294629)
@@ -46,11 +46,9 @@
     MediaControlsLightBarBackgroundPart,
     MediaFullScreenVolumeSliderPart,
     MediaFullScreenVolumeSliderThumbPart,
-    MediaPlayButtonPart,
     MediaSliderPart,
     MediaSliderThumbPart,
     MediaVolumeSliderPart,
-    MediaVolumeSliderMuteButtonPart,
     MediaVolumeSliderThumbPart,
     MenulistPart,
     MenulistButtonPart,

Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (294628 => 294629)


--- trunk/Source/WebCore/rendering/RenderTheme.cpp	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp	2022-05-23 09:06:26 UTC (rev 294629)
@@ -292,8 +292,6 @@
         return adjustMenuListStyle(style, element);
     case MenulistButtonPart:
         return adjustMenuListButtonStyle(style, element);
-    case MediaPlayButtonPart:
-        return adjustMediaControlStyle(style, element);
     case MediaSliderPart:
     case MediaVolumeSliderPart:
     case MediaFullScreenVolumeSliderPart:
@@ -546,14 +544,10 @@
     case SliderThumbHorizontalPart:
     case SliderThumbVerticalPart:
         return paintSliderThumb(box, paintInfo, integralSnappedRect);
-    case MediaPlayButtonPart:
-        return paintMediaPlayButton(box, paintInfo, integralSnappedRect);
     case MediaSliderPart:
         return paintMediaSliderTrack(box, paintInfo, integralSnappedRect);
     case MediaSliderThumbPart:
         return paintMediaSliderThumb(box, paintInfo, integralSnappedRect);
-    case MediaVolumeSliderMuteButtonPart:
-        return paintMediaMuteButton(box, paintInfo, integralSnappedRect);    
     case MediaVolumeSliderPart:
         return paintMediaVolumeSliderTrack(box, paintInfo, integralSnappedRect);
     case MediaVolumeSliderThumbPart:
@@ -1359,10 +1353,6 @@
 {
 }
 
-void RenderTheme::adjustMediaControlStyle(RenderStyle&, const Element*) const
-{
-}
-
 void RenderTheme::adjustSliderTrackStyle(RenderStyle&, const Element*) const
 {
 }

Modified: trunk/Source/WebCore/rendering/RenderTheme.h (294628 => 294629)


--- trunk/Source/WebCore/rendering/RenderTheme.h	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebCore/rendering/RenderTheme.h	2022-05-23 09:06:26 UTC (rev 294629)
@@ -394,9 +394,6 @@
     virtual void adjustSearchFieldResultsButtonStyle(RenderStyle&, const Element*) const;
     virtual bool paintSearchFieldResultsButton(const RenderBox&, const PaintInfo&, const IntRect&) { return true; }
 
-    virtual void adjustMediaControlStyle(RenderStyle&, const Element*) const;
-    virtual bool paintMediaPlayButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
-    virtual bool paintMediaMuteButton(const RenderObject&, 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; }

Modified: trunk/Source/WebInspectorUI/UserInterface/External/CSSDocumentation/CSSDocumentation-overrides.json (294628 => 294629)


--- trunk/Source/WebInspectorUI/UserInterface/External/CSSDocumentation/CSSDocumentation-overrides.json	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CSSDocumentation/CSSDocumentation-overrides.json	2022-05-23 09:06:26 UTC (rev 294629)
@@ -4,6 +4,6 @@
     },
     "-webkit-appearance": {
         "description": "Changes the appearance of buttons and other controls to resemble native controls.",
-        "syntax": "none | button | checkbox | default-button | listbox | media-play-button | media-slider | media-sliderthumb | media-volume-slider | media-volume-sliderthumb | menulist | menulist-button | meter | progress-bar | push-button | radio | searchfield | slider-horizontal | slider-vertical | square-button | textarea | textfield | -apple-pay-button"
+        "syntax": "none | button | checkbox | default-button | listbox | media-slider | media-sliderthumb | media-volume-slider | media-volume-sliderthumb | menulist | menulist-button | meter | progress-bar | push-button | radio | searchfield | slider-horizontal | slider-vertical | square-button | textarea | textfield | -apple-pay-button"
     }
 }

Modified: trunk/Source/WebInspectorUI/UserInterface/External/CSSDocumentation/CSSDocumentation.js (294628 => 294629)


--- trunk/Source/WebInspectorUI/UserInterface/External/CSSDocumentation/CSSDocumentation.js	2022-05-23 08:59:02 UTC (rev 294628)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CSSDocumentation/CSSDocumentation.js	2022-05-23 09:06:26 UTC (rev 294629)
@@ -29,7 +29,7 @@
     },
     "-webkit-appearance": {
         "description": "Changes the appearance of buttons and other controls to resemble native controls.",
-        "syntax": "none | button | checkbox | default-button | listbox | media-play-button | media-slider | media-sliderthumb | media-volume-slider | media-volume-sliderthumb | menulist | menulist-button | meter | progress-bar | push-button | radio | searchfield | slider-horizontal | slider-vertical | square-button | textarea | textfield | -apple-pay-button"
+        "syntax": "none | button | checkbox | default-button | listbox | media-slider | media-sliderthumb | media-volume-slider | media-volume-sliderthumb | menulist | menulist-button | meter | progress-bar | push-button | radio | searchfield | slider-horizontal | slider-vertical | square-button | textarea | textfield | -apple-pay-button"
     },
     "-webkit-backdrop-filter": {
         "description": "Applies a filter effect where the first filter in the list takes the element's background image as the input image."
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to