Changeset 154944 in webkit


Ignore:
Timestamp:
Sep 1, 2013 10:12:16 AM (11 years ago)
Author:
calvaris@igalia.com
Message:

Volume slider value should be 0 when audio is muted
https://bugs.webkit.org/show_bug.cgi?id=120553

Reviewed by Eric Carlson.

Source/WebCore:

Fixed the problem of showing a non empty slider when audio is
muted.

Test: media/volume-bar-empty-when-muted.html.

  • html/shadow/MediaControls.cpp:

(WebCore::MediaControls::reset): Use setSliderVolume.
(WebCore::MediaControls::changedVolume): Use setSliderVolume.
(WebCore::MediaControls::setSliderVolume): Added to set the volume
to 0 when muted and to its value otherwise.

  • html/shadow/MediaControls.h: Added setSliderVolume.
  • html/shadow/MediaControlsApple.cpp:

(WebCore::MediaControlsApple::reset): Used setSliderVolume and
setFullscreenSliderVolume.
(WebCore::MediaControlsApple::changedVolume): Used
setFullscreenSliderVolume.
(WebCore::MediaControlsApple::setFullscreenSliderVolume): Added to
set the volume to 0 when muted and to its value otherwise.

  • html/shadow/MediaControlsApple.h: Added setFullscreenSliderVolume
  • html/shadow/MediaControlsBlackBerry.cpp:

(WebCore::MediaControlsBlackBerry::reset): Used setSliderVolume.

LayoutTests:

Added test to check if the volume slider value is 0 when the
element is muted even if volume is set to something else.

  • media/volume-bar-empty-when-muted-expected.txt: Added.
  • media/volume-bar-empty-when-muted.html: Added.
Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r154942 r154944  
     12013-09-01  Xabier Rodriguez Calvar  <calvaris@igalia.com>
     2
     3        Volume slider value should be 0 when audio is muted
     4        https://bugs.webkit.org/show_bug.cgi?id=120553
     5
     6        Reviewed by Eric Carlson.
     7
     8        Added test to check if the volume slider value is 0 when the
     9        element is muted even if volume is set to something else.
     10
     11        * media/volume-bar-empty-when-muted-expected.txt: Added.
     12        * media/volume-bar-empty-when-muted.html: Added.
     13
    1142013-09-01  Joseph Pecoraro  <pecoraro@apple.com>
    215
  • trunk/Source/WebCore/ChangeLog

    r154943 r154944  
     12013-09-01  Xabier Rodriguez Calvar  <calvaris@igalia.com>
     2
     3        Volume slider value should be 0 when audio is muted
     4        https://bugs.webkit.org/show_bug.cgi?id=120553
     5
     6        Reviewed by Eric Carlson.
     7
     8        Fixed the problem of showing a non empty slider when audio is
     9        muted.
     10
     11        Test: media/volume-bar-empty-when-muted.html.
     12
     13        * html/shadow/MediaControls.cpp:
     14        (WebCore::MediaControls::reset): Use setSliderVolume.
     15        (WebCore::MediaControls::changedVolume): Use setSliderVolume.
     16        (WebCore::MediaControls::setSliderVolume): Added to set the volume
     17        to 0 when muted and to its value otherwise.
     18        * html/shadow/MediaControls.h: Added setSliderVolume.
     19        * html/shadow/MediaControlsApple.cpp:
     20        (WebCore::MediaControlsApple::reset): Used setSliderVolume and
     21        setFullscreenSliderVolume.
     22        (WebCore::MediaControlsApple::changedVolume): Used
     23        setFullscreenSliderVolume.
     24        (WebCore::MediaControlsApple::setFullscreenSliderVolume): Added to
     25        set the volume to 0 when muted and to its value otherwise.
     26        * html/shadow/MediaControlsApple.h: Added setFullscreenSliderVolume
     27        * html/shadow/MediaControlsBlackBerry.cpp:
     28        (WebCore::MediaControlsBlackBerry::reset): Used setSliderVolume.
     29
    1302013-09-01  Andreas Kling  <akling@apple.com>
    231
  • trunk/Source/WebCore/html/shadow/MediaControls.cpp

    r154877 r154944  
    109109        else {
    110110            m_volumeSlider->show();
    111             m_volumeSlider->setVolume(m_mediaController->volume());
     111            setSliderVolume();
    112112        }
    113113    }
     
    241241{
    242242    if (m_volumeSlider)
    243         m_volumeSlider->setVolume(m_mediaController->volume());
     243        setSliderVolume();
    244244    if (m_panelMuteButton && m_panelMuteButton->renderer())
    245245        m_panelMuteButton->renderer()->repaint();
     
    426426#endif
    427427
    428 }
    429 
    430 #endif
     428void MediaControls::setSliderVolume()
     429{
     430    m_volumeSlider->setVolume(m_mediaController->muted() ? 0.0 : m_mediaController->volume());
     431}
     432
     433}
     434
     435#endif
  • trunk/Source/WebCore/html/shadow/MediaControls.h

    r151947 r154944  
    115115    virtual bool containsRelatedTarget(Event*);
    116116
     117    void setSliderVolume();
     118
    117119    MediaControllerInterface* m_mediaController;
    118120
  • trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp

    r154877 r154944  
    341341
    342342    if (m_volumeSlider)
    343         m_volumeSlider->setVolume(m_mediaController->volume());
     343        setSliderVolume();
    344344
    345345    if (m_toggleClosedCaptionsButton) {
     
    355355#if ENABLE(FULLSCREEN_API)
    356356    if (m_fullScreenVolumeSlider)
    357         m_fullScreenVolumeSlider->setVolume(m_mediaController->volume());
     357        setFullscreenSliderVolume();
    358358
    359359    if (m_isFullscreen) {
     
    447447
    448448    if (m_fullScreenVolumeSlider)
    449         m_fullScreenVolumeSlider->setVolume(m_mediaController->volume());
     449        setFullscreenSliderVolume();
    450450}
    451451
     
    550550}
    551551
     552void MediaControlsApple::setFullscreenSliderVolume()
     553{
     554    m_fullScreenVolumeSlider->setVolume(m_mediaController->muted() ? 0.0 : m_mediaController->volume());
     555}
     556
    552557bool MediaControlsApple::shouldClosedCaptionsContainerPreventPageScrolling(int wheelDeltaY)
    553558{
  • trunk/Source/WebCore/html/shadow/MediaControlsApple.h

    r151592 r154944  
    100100    void showClosedCaptionTrackList();
    101101    void hideClosedCaptionTrackList();
     102    void setFullscreenSliderVolume();
    102103
    103104    MediaControlRewindButtonElement* m_rewindButton;
  • trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp

    r154178 r154944  
    932932
    933933    if (m_volumeSlider)
    934         m_volumeSlider->setVolume(m_mediaController->volume());
     934        setSliderVolume();
    935935
    936936    if (m_toggleClosedCaptionsButton) {
Note: See TracChangeset for help on using the changeset viewer.