Title: [123259] trunk
- Revision
- 123259
- Author
- [email protected]
- Date
- 2012-07-20 14:12:02 -0700 (Fri, 20 Jul 2012)
Log Message
[chromium] CSS tweaks to media controls to prevent styles from being overridden
https://bugs.webkit.org/show_bug.cgi?id=91802
Reviewed by Eric Carlson.
Source/WebCore:
Having the buttons declared as inline caused them to not be included in the box layout,
resulting in styles set outside the media element to affect the position of the buttons.
In a similar vein, it was also possible to override the font-style attribute for the time
display.
Test: media/controls-styling-strict.html
* css/mediaControlsChromium.css:
(audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
(audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button):
(audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display):
(audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button):
LayoutTests:
* media/controls-styling-strict.html: Added.
* platform/chromium-linux/media/controls-styling-strict-expected.png: Added.
* platform/chromium-linux/media/controls-styling-strict-expected.txt: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (123258 => 123259)
--- trunk/LayoutTests/ChangeLog 2012-07-20 21:08:59 UTC (rev 123258)
+++ trunk/LayoutTests/ChangeLog 2012-07-20 21:12:02 UTC (rev 123259)
@@ -1,3 +1,14 @@
+2012-07-19 Andrew Scherkus <[email protected]>
+
+ [chromium] CSS tweaks to media controls to prevent styles from being overridden
+ https://bugs.webkit.org/show_bug.cgi?id=91802
+
+ Reviewed by Eric Carlson.
+
+ * media/controls-styling-strict.html: Added.
+ * platform/chromium-linux/media/controls-styling-strict-expected.png: Added.
+ * platform/chromium-linux/media/controls-styling-strict-expected.txt: Added.
+
2012-07-20 Tony Chang <[email protected]>
[chromium] Unreviewed gardening. Unskip some tests that just need new baselines.
Added: trunk/LayoutTests/media/controls-styling-strict.html (0 => 123259)
--- trunk/LayoutTests/media/controls-styling-strict.html (rev 0)
+++ trunk/LayoutTests/media/controls-styling-strict.html 2012-07-20 21:12:02 UTC (rev 123259)
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <script src=""
+ <script src=""
+ <style>
+ video:nth-of-type(1) {
+ font: bold italic 30px monospace;
+ color: red;
+ }
+ </style>
+ </head>
+ <body _onload_="setSrcByTagName('video', findMediaFile('video', 'content/test')); init();">
+ <p>The look of the controls should not change when styled under strict mode.</p>
+ <video controls></video>
+ <video controls></video>
+ </body>
+</html>
Property changes on: trunk/LayoutTests/media/controls-styling-strict.html
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (123258 => 123259)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-20 21:08:59 UTC (rev 123258)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-20 21:12:02 UTC (rev 123259)
@@ -2887,26 +2887,6 @@
BUGWK81402 WIN : media/track/track-active-cues.html = PASS TIMEOUT
BUGWK83882 : media/track/track-mode.html = PASS TEXT TIMEOUT
-// Need rebaseline after patch lands.
-BUGWK89696 WIN MAC : media/audio-controls-rendering.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/audio-repaint.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/controls-after-reload.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/controls-layout-direction.html = IMAGE
-BUGWK89696 WIN MAC : media/controls-strict.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/controls-styling.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/controls-without-preload.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/media-controls-clone.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/media-document-audio-repaint.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/video-controls-rendering.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/video-display-toggle.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/video-no-audio.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/video-playing-and-pause.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : media/video-zoom-controls.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : fast/layers/video-layer.html = IMAGE IMAGE+TEXT
-BUGWK89696 WIN MAC : fullscreen/full-screen-stacking-context.html = IMAGE
-BUGWK89696 WIN MAC : http/tests/media/video-buffered-range-contains-currentTime.html = IMAGE
-BUGWK89416 WIN MAC : media/video-empty-source.html = IMAGE IMAGE+TEXT
-
BUGWK72271 SNOWLEOPARD DEBUG : fast/dom/node-iterator-reference-node-moved-crash.html = PASS CRASH
BUGWK72376 WIN : fast/forms/file/input-file-label.html = TEXT PASS
@@ -3657,3 +3637,21 @@
BUGWK87844 SNOWLEOPARD : fast/forms/datalist/input-appearance-range-with-datalist-rtl.html = IMAGE
BUGWK87844 SNOWLEOPARD : fast/forms/datalist/input-appearance-range-with-datalist-zoomed.html = IMAGE
BUGWK87844 SNOWLEOPARD : fast/forms/datalist/input-appearance-range-with-datalist.html = IMAGE
+
+// Needs rebaseline.
+BUGWK91802 : media/media-document-audio-repaint.html = IMAGE+TEXT
+BUGWK91802 : media/video-controls-audio-only.html = IMAGE+TEXT
+BUGWK91802 : fast/layers/video-layer.html = TEXT
+BUGWK91802 : media/audio-controls-rendering.html = TEXT
+BUGWK91802 : media/audio-repaint.html = TEXT
+BUGWK91802 : media/controls-after-reload.html = TEXT
+BUGWK91802 : media/controls-strict.html = TEXT
+BUGWK91802 : media/controls-styling.html = TEXT
+BUGWK91802 : media/controls-without-preload.html = TEXT
+BUGWK91802 : media/media-controls-clone.html = TEXT
+BUGWK91802 : media/video-controls-rendering.html = TEXT
+BUGWK91802 : media/video-display-toggle.html = TEXT
+BUGWK91802 : media/video-empty-source.html = TEXT
+BUGWK91802 : media/video-no-audio.html = TEXT
+BUGWK91802 : media/video-playing-and-pause.html = TEXT
+BUGWK91802 : media/video-zoom-controls.html = TEXT
Modified: trunk/Source/WebCore/ChangeLog (123258 => 123259)
--- trunk/Source/WebCore/ChangeLog 2012-07-20 21:08:59 UTC (rev 123258)
+++ trunk/Source/WebCore/ChangeLog 2012-07-20 21:12:02 UTC (rev 123259)
@@ -1,3 +1,24 @@
+2012-07-19 Andrew Scherkus <[email protected]>
+
+ [chromium] CSS tweaks to media controls to prevent styles from being overridden
+ https://bugs.webkit.org/show_bug.cgi?id=91802
+
+ Reviewed by Eric Carlson.
+
+ Having the buttons declared as inline caused them to not be included in the box layout,
+ resulting in styles set outside the media element to affect the position of the buttons.
+
+ In a similar vein, it was also possible to override the font-style attribute for the time
+ display.
+
+ Test: media/controls-styling-strict.html
+
+ * css/mediaControlsChromium.css:
+ (audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
+ (audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button):
+ (audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display):
+ (audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button):
+
2012-07-20 Han Shen <[email protected]>
[Chromium] Compilation fails under gcc 4.7
Modified: trunk/Source/WebCore/css/mediaControlsChromium.css (123258 => 123259)
--- trunk/Source/WebCore/css/mediaControlsChromium.css 2012-07-20 21:08:59 UTC (rev 123258)
+++ trunk/Source/WebCore/css/mediaControlsChromium.css 2012-07-20 21:12:02 UTC (rev 123259)
@@ -79,7 +79,7 @@
audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
-webkit-appearance: media-mute-button;
- display: inline;
+ display: -webkit-box;
border: none;
box-sizing: border-box;
width: 35px;
@@ -91,7 +91,7 @@
audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
-webkit-appearance: media-play-button;
- display: inline;
+ display: -webkit-box;
border: none;
box-sizing: border-box;
width: 30px;
@@ -118,6 +118,7 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 13px;
font-weight: bold;
+ font-style: normal;
color: white;
letter-spacing: normal;
@@ -179,7 +180,7 @@
audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
-webkit-appearance: media-enter-fullscreen-button;
- display: inline;
+ display: -webkit-box;
border: none;
box-sizing: border-box;
width: 30px;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes