Changeset 49995 in webkit

Timestamp:

Oct 23, 2009 1:35:15 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-10-23 Alpha Lam <​hclam@chromium.org>

Reviewed by Eric Carlson.

Volume slider always starts at half volume
​https://bugs.webkit.org/show_bug.cgi?id=28322

• media/video-volume-slider.html: Added. Pixel test for the volume slider of the media control. This test assumes volume slider is implemented and usable. It moves the mouse over the right bottom corner of a video element to trigger the volume slider. If volume slider is not implemented at all, you'll only see a video element with the first frame.
• platform/gtk/Skipped: The above test requires a volume slider so it's skipped.
• platform/mac/Skipped: ditto.
• platform/win/Skipped: ditto.

2009-10-23 Alpha Lam <​hclam@chromium.org>

Reviewed by Eric Carlson.

Volume slider always starts at half volume
​https://bugs.webkit.org/show_bug.cgi?id=28322

Sets the value attribute of volume slider to the volume attribute
of the media element. Also update the value attribute of the
input element for the volume slider when the volume attribute
of the media element is updated.

Test: media/video-volume-slider.html

• rendering/MediaControlElements.cpp: (WebCore::MediaControlVolumeSliderElement::update): Set the value attribute of the input element for the volume slider using the current volume of the media element.
• rendering/MediaControlElements.h: Add method definition of update().
• rendering/RenderMedia.cpp: (WebCore::RenderMedia::createVolumeSlider): Creates a volume slider with value attribute equals to the current volume attribute of the media element.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-volume-slider.html (added)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/MediaControlElements.cpp (modified) (1 diff)
• WebCore/rendering/MediaControlElements.h (modified) (1 diff)
• WebCore/rendering/RenderMedia.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-23  Alpha Lam  <hclam@chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Volume slider always starts at half volume
+        https://bugs.webkit.org/show_bug.cgi?id=28322
+
+        * media/video-volume-slider.html: Added.
+        Pixel test for the volume slider of the media control. This test
+        assumes volume slider is implemented and usable. It moves the mouse
+        over the right bottom corner of a video element to trigger the
+        volume slider. If volume slider is not implemented at all, you'll
+        only see a video element with the first frame.
+        * platform/gtk/Skipped: The above test requires a volume slider so it's skipped.
+        * platform/mac/Skipped: ditto.
+        * platform/win/Skipped: ditto.
+
 2009-10-23  Andrew Scherkus  <scherkus@chromium.org>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -3612 +3612 @@
 media/video-zoom-controls.html
 media/video-zoom.html
+# This test requires media controls has a volume slider.
+media/video-volume-slider.html
 
 # Tests in plugins/ directory

trunk/LayoutTests/platform/mac/Skipped

@@ -85 +85 @@
 media/video-controls-zoomed.html
 
+# This test requires media controls has a volume slider.
+media/video-volume-slider.html
+
 # As long as pages with unload handlers are put in the Page Cache, this test doesn't make any sense for Mac.
 # <rdar://problem/7196485> and https://bugs.webkit.org/show_bug.cgi?id=29021

trunk/LayoutTests/platform/win/Skipped

@@ -48 +48 @@
 # <rdar://problem/6710625> Test media/video-error-abort.html doesn't work
 media/video-error-abort.html
+
+# This test requires media controls has a volume slider.
+media/video-volume-slider.html
 
 # <rdar://problem/5075790> Layout tests that depend on certain fonts don't match Mac results:

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-23  Alpha Lam  <hclam@chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Volume slider always starts at half volume
+        https://bugs.webkit.org/show_bug.cgi?id=28322
+
+        Sets the value attribute of volume slider to the volume attribute
+        of the media element. Also update the value attribute of the
+        input element for the volume slider when the volume attribute
+        of the media element is updated.
+
+        Test: media/video-volume-slider.html
+
+        * rendering/MediaControlElements.cpp:
+        (WebCore::MediaControlVolumeSliderElement::update):
+        Set the value attribute of the input element for the volume slider
+        using the current volume of the media element.
+        * rendering/MediaControlElements.h:
+        Add method definition of update().
+        * rendering/RenderMedia.cpp:
+        (WebCore::RenderMedia::createVolumeSlider):
+        Creates a volume slider with value attribute equals to the current
+        volume attribute of the media element.
+
 2009-10-23  Evan Martin  <evan@chromium.org>
 

trunk/WebCore/rendering/MediaControlElements.cpp

@@ -647 +647 @@
 }
 
+void MediaControlVolumeSliderElement::update()
+{
+    float volume = m_mediaElement->volume();
+    if (value().toFloat() != volume) {
+        setValue(String::number(volume));
+        MediaControlInputElement::update();
+    }
+}
+
 // ----------------------------
 

trunk/WebCore/rendering/MediaControlElements.h

@@ -235 +235 @@
     MediaControlVolumeSliderElement(Document*, HTMLMediaElement*);
     virtual void defaultEventHandler(Event*);
+    virtual void update();
 };
 

trunk/WebCore/rendering/RenderMedia.cpp

@@ -259 +259 @@
     m_volumeSlider->setAttribute(precisionAttr, "float");
     m_volumeSlider->setAttribute(maxAttr, "1");
+    m_volumeSlider->setAttribute(valueAttr, String::number(mediaElement()->volume()));
     m_volumeSlider->attachToParent(m_volumeSliderContainer.get());
 }