Diff
Modified: trunk/LayoutTests/ChangeLog (113608 => 113609)
--- trunk/LayoutTests/ChangeLog 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/LayoutTests/ChangeLog 2012-04-09 20:10:42 UTC (rev 113609)
@@ -1,3 +1,14 @@
+2012-04-09 Victor Carbune <[email protected]>
+
+ Simplified volume rendering.
+ https://bugs.webkit.org/show_bug.cgi?id=82150
+
+ Reviewed by Eric Carlson.
+
+ * media/video-controls-rendering-toggle-display-none-expected.txt: Added.
+ * media/video-controls-rendering-toggle-display-none.html: Added.
+ * platform/chromium/test_expectations.txt: Marked tests for rebaseline.
+
2012-04-09 Martin Robinson <[email protected]>
[soup] Crash while loading http://www.jusco.cn
Added: trunk/LayoutTests/media/video-controls-rendering-toggle-display-none-expected.txt (0 => 113609)
--- trunk/LayoutTests/media/video-controls-rendering-toggle-display-none-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-controls-rendering-toggle-display-none-expected.txt 2012-04-09 20:10:42 UTC (rev 113609)
@@ -0,0 +1,9 @@
+Tests that the video controls are properly rendered when the display none is set and unset.
+
+** The volume slider should have almost the same left offset as the mute button **
+EXPECTED (volumeSliderElement.offsetLeft >= muteButtonElement.offsetLeft - threshold == 'true') OK
+EXPECTED (volumeSliderElement.offsetLeft <= muteButtonElement.offsetLeft + threshold == 'true') OK
+
+** The volume slider should be on top of the mute button **
+EXPECTED (volumeSliderElement.offsetTop < muteButtonElement.offsetTop == 'true') OK
+
Added: trunk/LayoutTests/media/video-controls-rendering-toggle-display-none.html (0 => 113609)
--- trunk/LayoutTests/media/video-controls-rendering-toggle-display-none.html (rev 0)
+++ trunk/LayoutTests/media/video-controls-rendering-toggle-display-none.html 2012-04-09 20:10:42 UTC (rev 113609)
@@ -0,0 +1,70 @@
+<html>
+<head>
+ <title>Test rendering of volume slider of video tag</title>
+ <script src=""
+ <script src=""
+ <script src=""
+ <script>
+ var video;
+ var panel;
+ var threshold = 2;
+
+ var muteButtonCoordinates;
+ var volumeSliderCoordinates;
+
+ var volumeSliderElement;
+ var muteButtonElement;
+
+ function init()
+ {
+ video = document.getElementsByTagName("video")[0];
+ video.src = "" "content/test");
+ }
+
+ function test()
+ {
+ if (window.eventSender) {
+ try {
+ muteButtonCoordinates = mediaControlsButtonCoordinates(video, "mute-button");
+ volumeSliderCoordinates = mediaControlsButtonCoordinates(video, "volume-slider-container");
+ } catch (exception) {
+ layoutTestController.notifyDone();
+ return;
+ }
+
+ eventSender.mouseMoveTo(muteButtonCoordinates[0], muteButtonCoordinates[1]);
+ }
+
+ panel = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-panel");
+ volumeSliderElement = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-volume-slider-container");
+ muteButtonElement = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-mute-button");
+
+
+ // Ensure paint with display property set to "none".
+ panel.style.display = "none";
+ document.body.offsetTop;
+
+ // Ensure (re)paint with default display property.
+ panel.style.removeProperty("display");
+ document.body.offsetTop;
+
+ // Test that the left offset of both controls is equal.
+ consoleWrite("");
+ consoleWrite("** The volume slider should have almost the same left offset as the mute button **");
+ testExpected("volumeSliderElement.offsetLeft >= muteButtonElement.offsetLeft - threshold", true);
+ testExpected("volumeSliderElement.offsetLeft <= muteButtonElement.offsetLeft + threshold", true);
+
+ consoleWrite("");
+ consoleWrite("** The volume slider should be on top of the mute button **");
+ testExpected("volumeSliderElement.offsetTop < muteButtonElement.offsetTop", true);
+
+ layoutTestController.notifyDone();
+ }
+ </script>
+</head>
+<body _onload_="init()">
+ Tests that the video controls are properly rendered when the display none is set and unset.<br>
+
+ <video _oncanplaythrough_="test()" controls preload="true"></video>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (113608 => 113609)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-04-09 20:10:42 UTC (rev 113609)
@@ -3555,6 +3555,24 @@
BUGWK37244 : tables/mozilla/bugs/bug27038-1.html = IMAGE+TEXT
BUGWK37244 : tables/mozilla/bugs/bug27038-2.html = IMAGE+TEXT
+// Need rebaselining.
+BUGWK82150 : media/media-document-audio-repaint.html = IMAGE+TEXT
+BUGWK82150 : media/video-no-audio.html = IMAGE+TEXT
+BUGWK82150 : media/controls-strict.html = IMAGE+TEXT
+BUGWK82150 : media/video-volume-slider.html = IMAGE+TEXT
+BUGWK82150 : media/controls-styling.html = IMAGE+TEXT
+BUGWK82150 : media/video-display-toggle.html = IMAGE+TEXT
+BUGWK82150 : media/audio-repaint.html = IMAGE+TEXT
+BUGWK82150 : media/audio-controls-rendering.html = IMAGE+TEXT
+BUGWK82150 : media/video-zoom-controls.html = IMAGE+TEXT
+BUGWK82150 : media/video-controls-rendering.html = IMAGE+TEXT
+BUGWK82150 : media/controls-without-preload.html = IMAGE+TEXT
+BUGWK82150 : media/media-controls-clone.html = IMAGE+TEXT
+BUGWK82150 : fast/layers/video-layer.html = IMAGE+TEXT
+BUGWK82150 : media/video-empty-source.html = IMAGE+TEXT
+BUGWK82150 : media/video-playing-and-pause.html = IMAGE+TEXT
+BUGWK82150 : media/controls-after-reload.html = IMAGE+TEXT
+
// New test, flaky since added in r110965.
BUGWK82097 : editing/selection/move-by-word-visually-crash-test-5.html = PASS TIMEOUT
Modified: trunk/Source/WebCore/ChangeLog (113608 => 113609)
--- trunk/Source/WebCore/ChangeLog 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/Source/WebCore/ChangeLog 2012-04-09 20:10:42 UTC (rev 113609)
@@ -1,3 +1,29 @@
+2012-04-09 Victor Carbune <[email protected]>
+
+ Simplified volume slider rendering.
+ https://bugs.webkit.org/show_bug.cgi?id=82150
+
+ Reviewed by Eric Carlson.
+
+ Test: media/video-controls-rendering-toggle-display-none.html
+
+ * css/mediaControlsChromium.css: Update controls css for Chromium.
+ (audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
+ (audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
+ (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
+ * css/mediaControlsQuickTime.css: Update controls css for Safari.
+ (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
+ * html/shadow/MediaControlElements.cpp: Removed particular renderer.
+ (WebCore):
+ * html/shadow/MediaControlElements.h:
+ (MediaControlVolumeSliderContainerElement): Removed particular renderer.
+ * html/shadow/MediaControlRootElement.cpp:
+ (WebCore::MediaControlRootElement::create): Added a div element as a container. Removed extra
+ unused mute button.
+ * html/shadow/MediaControlRootElementChromium.cpp: Added an extra div element as a container for
+ the mute button and the volume slider to easily position them relative to each other.
+ (WebCore::MediaControlRootElementChromium::create):
+
2012-04-09 Levi Weintraub <[email protected]>
Correct some LayoutUnit misuse in FilterEffectRenderer, and RenderBlock
Modified: trunk/Source/WebCore/css/mediaControlsChromium.css (113608 => 113609)
--- trunk/Source/WebCore/css/mediaControlsChromium.css 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/Source/WebCore/css/mediaControlsChromium.css 2012-04-09 20:10:42 UTC (rev 113609)
@@ -41,6 +41,7 @@
audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
-webkit-user-select: none;
+ -webkit-box-pack: end;
position: relative;
overflow: visible;
bottom: 0;
@@ -54,9 +55,13 @@
bottom: 0px;
}
+audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
+ -webkit-box-align: end;
+}
+
audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
-webkit-appearance: media-mute-button;
- position: absolute;
+ position: relative;
top: auto;
bottom: 0;
right: 0;
@@ -149,7 +154,7 @@
audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
-webkit-appearance: media-volume-slider-container;
- position: absolute;
+ position: relative;
width: 34px;
height: 100px;
Modified: trunk/Source/WebCore/css/mediaControlsQuickTime.css (113608 => 113609)
--- trunk/Source/WebCore/css/mediaControlsQuickTime.css 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/Source/WebCore/css/mediaControlsQuickTime.css 2012-04-09 20:10:42 UTC (rev 113609)
@@ -48,6 +48,9 @@
margin-left: 2px;
margin-right: 9px;
border: none !important;
+
+ position: relative;
+ z-index: 2;
}
audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
@@ -200,8 +203,8 @@
-webkit-appearance: media-volume-slider-container;
position: absolute;
- top: 0;
- left: 0;
+ bottom: 0px;
+ z-index: 1;
width: 22px;
height: 114px;
@@ -218,16 +221,3 @@
width: 10px;
height: 80px;
}
-
-audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button {
- -webkit-appearance: media-volume-slider-mute-button;
- display: inline;
- position: absolute;
-
- bottom: 5px;
- left: 4px;
-
- width: 14px;
- height: 12px;
- border: none !important;
-}
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (113608 => 113609)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-04-09 20:10:42 UTC (rev 113609)
@@ -320,34 +320,6 @@
// ----------------------------
-class RenderMediaVolumeSliderContainer : public RenderBlock {
-public:
- RenderMediaVolumeSliderContainer(Node*);
-
-private:
- virtual void layout();
-};
-
-RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer(Node* node)
- : RenderBlock(node)
-{
-}
-
-void RenderMediaVolumeSliderContainer::layout()
-{
- RenderBlock::layout();
- if (style()->display() == NONE || !previousSibling() || !previousSibling()->isBox())
- return;
-
- RenderBox* buttonBox = toRenderBox(previousSibling());
-
- LayoutStateDisabler layoutStateDisabler(view());
-
- LayoutPoint offset = theme()->volumeSliderOffsetFromMuteButton(buttonBox, size());
- setX(offset.x() + buttonBox->offsetLeft());
- setY(offset.y() + buttonBox->offsetTop());
-}
-
inline MediaControlVolumeSliderContainerElement::MediaControlVolumeSliderContainerElement(Document* document)
: MediaControlElement(document)
{
@@ -360,11 +332,6 @@
return element.release();
}
-RenderObject* MediaControlVolumeSliderContainerElement::createRenderer(RenderArena* arena, RenderStyle*)
-{
- return new (arena) RenderMediaVolumeSliderContainer(this);
-}
-
void MediaControlVolumeSliderContainerElement::defaultEventHandler(Event* event)
{
if (!event->isMouseEvent() || event->type() != eventNames().mouseoutEvent)
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (113608 => 113609)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2012-04-09 20:10:42 UTC (rev 113609)
@@ -159,7 +159,6 @@
private:
MediaControlVolumeSliderContainerElement(Document*);
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
virtual void defaultEventHandler(Event*);
virtual MediaControlElementType displayType() const;
virtual const AtomicString& shadowPseudoId() const;
Modified: trunk/Source/WebCore/html/shadow/MediaControlRootElement.cpp (113608 => 113609)
--- trunk/Source/WebCore/html/shadow/MediaControlRootElement.cpp 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/Source/WebCore/html/shadow/MediaControlRootElement.cpp 2012-04-09 20:10:42 UTC (rev 113609)
@@ -173,11 +173,8 @@
controls->m_fullScreenButton = fullScreenButton.get();
panel->appendChild(fullScreenButton.release(), ec, true);
- RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
- controls->m_panelMuteButton = panelMuteButton.get();
- panel->appendChild(panelMuteButton.release(), ec, true);
- if (ec)
- return 0;
+ // The mute button and the slider element should be in the same div.
+ RefPtr<HTMLDivElement> panelVolumeControlContainer = HTMLDivElement::create(document);
if (document->page()->theme()->usesMediaControlVolumeSlider()) {
RefPtr<MediaControlVolumeSliderContainerElement> volumeSliderContainer = MediaControlVolumeSliderContainerElement::create(document);
@@ -188,18 +185,22 @@
if (ec)
return 0;
- RefPtr<MediaControlVolumeSliderMuteButtonElement> volumeSliderMuteButton = MediaControlVolumeSliderMuteButtonElement::create(document);
- controls->m_volumeSliderMuteButton = volumeSliderMuteButton.get();
- volumeSliderContainer->appendChild(volumeSliderMuteButton.release(), ec, true);
- if (ec)
- return 0;
-
controls->m_volumeSliderContainer = volumeSliderContainer.get();
- panel->appendChild(volumeSliderContainer.release(), ec, true);
+ panelVolumeControlContainer->appendChild(volumeSliderContainer.release(), ec, true);
if (ec)
return 0;
}
+ RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
+ controls->m_panelMuteButton = panelMuteButton.get();
+ panelVolumeControlContainer->appendChild(panelMuteButton.release(), ec, true);
+ if (ec)
+ return 0;
+
+ panel->appendChild(panelVolumeControlContainer, ec, true);
+ if (ec)
+ return 0;
+
// FIXME: Only create when needed <http://webkit.org/b/57163>
RefPtr<MediaControlFullscreenVolumeMinButtonElement> fullScreenMinVolumeButton = MediaControlFullscreenVolumeMinButtonElement::create(document);
controls->m_fullScreenMinVolumeButton = fullScreenMinVolumeButton.get();
Modified: trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp (113608 => 113609)
--- trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp 2012-04-09 20:01:26 UTC (rev 113608)
+++ trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp 2012-04-09 20:10:42 UTC (rev 113609)
@@ -106,11 +106,7 @@
if (ec)
return 0;
- RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
- controls->m_panelMuteButton = panelMuteButton.get();
- panel->appendChild(panelMuteButton.release(), ec, true);
- if (ec)
- return 0;
+ RefPtr<HTMLDivElement> panelVolumeControlContainer = HTMLDivElement::create(document);
RefPtr<MediaControlVolumeSliderContainerElement> volumeSliderContainer = MediaControlVolumeSliderContainerElement::create(document);
@@ -121,10 +117,20 @@
return 0;
controls->m_volumeSliderContainer = volumeSliderContainer.get();
- panel->appendChild(volumeSliderContainer.release(), ec, true);
+ panelVolumeControlContainer->appendChild(volumeSliderContainer.release(), ec, true);
if (ec)
return 0;
+ RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
+ controls->m_panelMuteButton = panelMuteButton.get();
+ panelVolumeControlContainer->appendChild(panelMuteButton.release(), ec, true);
+ if (ec)
+ return 0;
+
+ panel->appendChild(panelVolumeControlContainer, ec, true);
+ if (ec)
+ return 0;
+
controls->m_panel = panel.get();
controls->appendChild(panel.release(), ec, true);
if (ec)
