Title: [260261] trunk/Source/WebCore
- Revision
- 260261
- Author
- grao...@webkit.org
- Date
- 2020-04-17 10:24:20 -0700 (Fri, 17 Apr 2020)
Log Message
Stop including style rules related to media controls in the UA style sheet when Modern Media Controls are enabled
https://bugs.webkit.org/show_bug.cgi?id=210606
Reviewed by Antti Koivisto and Daniel Bates.
There is no need to insert style rules related to media controls in the UA stylesheet when Modern Media Controls are enabled.
There is one rule from mediaControlsApple.css for the default sizing of <audio> that makes sense broadly for content on the Web
so we move that to html.css. We also set the background-color property for media documents in html.css.
* Modules/mediacontrols/mediaControlsApple.css:
(audio): Deleted.
(body:-webkit-full-page-media): Deleted.
* Modules/mediacontrols/mediaControlsiOS.css:
(body:-webkit-full-page-media): Deleted.
* Modules/modern-media-controls/controls/media-document.css:
(:host(.media-document)):
* css/html.css:
(body:-webkit-full-page-media):
(audio):
* css/mediaControls.css:
(body:-webkit-full-page-media): Deleted.
* style/UserAgentStyle.cpp:
(WebCore::Style::UserAgentStyle::ensureDefaultStyleSheetsForElement):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (260260 => 260261)
--- trunk/Source/WebCore/ChangeLog 2020-04-17 17:17:59 UTC (rev 260260)
+++ trunk/Source/WebCore/ChangeLog 2020-04-17 17:24:20 UTC (rev 260261)
@@ -1,3 +1,29 @@
+2020-04-17 Antoine Quint <grao...@apple.com>
+
+ Stop including style rules related to media controls in the UA style sheet when Modern Media Controls are enabled
+ https://bugs.webkit.org/show_bug.cgi?id=210606
+
+ Reviewed by Antti Koivisto and Daniel Bates.
+
+ There is no need to insert style rules related to media controls in the UA stylesheet when Modern Media Controls are enabled.
+ There is one rule from mediaControlsApple.css for the default sizing of <audio> that makes sense broadly for content on the Web
+ so we move that to html.css. We also set the background-color property for media documents in html.css.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio): Deleted.
+ (body:-webkit-full-page-media): Deleted.
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (body:-webkit-full-page-media): Deleted.
+ * Modules/modern-media-controls/controls/media-document.css:
+ (:host(.media-document)):
+ * css/html.css:
+ (body:-webkit-full-page-media):
+ (audio):
+ * css/mediaControls.css:
+ (body:-webkit-full-page-media): Deleted.
+ * style/UserAgentStyle.cpp:
+ (WebCore::Style::UserAgentStyle::ensureDefaultStyleSheetsForElement):
+
2020-04-17 Peng Liu <peng.l...@apple.com>
Cleanup the macros for video fullscreen and picture-in-picture
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (260260 => 260261)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2020-04-17 17:17:59 UTC (rev 260260)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2020-04-17 17:24:20 UTC (rev 260261)
@@ -22,15 +22,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-audio {
- width: 200px;
- height: 25px;
-}
-
-body:-webkit-full-page-media {
- background-color: rgb(38, 38, 38);
-}
-
video:-webkit-full-page-media {
margin: auto;
position: absolute;
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (260260 => 260261)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2020-04-17 17:17:59 UTC (rev 260260)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2020-04-17 17:24:20 UTC (rev 260261)
@@ -32,10 +32,6 @@
height: 39px;
}
-body:-webkit-full-page-media {
- background-color: rgb(38, 38, 38);
-}
-
video:-webkit-full-page-media {
margin: auto;
position: absolute;
Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-document.css (260260 => 260261)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-document.css 2020-04-17 17:17:59 UTC (rev 260260)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-document.css 2020-04-17 17:24:20 UTC (rev 260261)
@@ -27,6 +27,13 @@
max-width: 100% !important;
max-height: 100% !important;
min-height: 50px !important;
+
+ margin: auto !important;
+ position: absolute !important;
+ top: 0 !important;
+ right: 0 !important;
+ bottom: 0 !important;
+ left: 0 !important;
}
/* Audio */
Modified: trunk/Source/WebCore/css/html.css (260260 => 260261)
--- trunk/Source/WebCore/css/html.css 2020-04-17 17:17:59 UTC (rev 260260)
+++ trunk/Source/WebCore/css/html.css 2020-04-17 17:24:20 UTC (rev 260261)
@@ -106,6 +106,12 @@
border-width: 1px;
}
+/* media elements */
+
+body:-webkit-full-page-media {
+ background-color: rgb(38, 38, 38);
+}
+
video {
object-fit: contain;
#if defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY
@@ -113,6 +119,11 @@
#endif
}
+audio {
+ width: 200px;
+ height: 25px;
+}
+
/* heading elements */
h1 {
Modified: trunk/Source/WebCore/css/mediaControls.css (260260 => 260261)
--- trunk/Source/WebCore/css/mediaControls.css 2020-04-17 17:17:59 UTC (rev 260260)
+++ trunk/Source/WebCore/css/mediaControls.css 2020-04-17 17:24:20 UTC (rev 260261)
@@ -24,10 +24,6 @@
/* media controls */
-body:-webkit-full-page-media {
- background-color: rgb(38, 38, 38);
-}
-
audio {
width: 200px;
height: 16px;
Modified: trunk/Source/WebCore/style/UserAgentStyle.cpp (260260 => 260261)
--- trunk/Source/WebCore/style/UserAgentStyle.cpp 2020-04-17 17:17:59 UTC (rev 260260)
+++ trunk/Source/WebCore/style/UserAgentStyle.cpp 2020-04-17 17:24:20 UTC (rev 260261)
@@ -237,7 +237,7 @@
}
}
#if ENABLE(VIDEO)
- else if (is<HTMLMediaElement>(element)) {
+ else if (is<HTMLMediaElement>(element) && !RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled()) {
if (!mediaControlsStyleSheet) {
String mediaRules = RenderTheme::singleton().mediaControlsStyleSheet();
if (mediaRules.isEmpty())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
