diff options
| author | Ada Chan <adachan@apple.com> | 2015-01-05 16:04:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-01-06 18:15:52 +0100 |
| commit | 2ac307d6884c1f68f092749076d60dacfc18c365 (patch) | |
| tree | 814bbf9c2880e780f016e2c9bc42ba237841abec | |
| parent | c92fe03ac19f09eb5db25cb0f02809fab80fbecc (diff) | |
| download | qtwebkit-2ac307d6884c1f68f092749076d60dacfc18c365.tar.gz | |
Calling WebCore::Page::setMediaVolume(0) does not mute videos as expected.
https://bugs.webkit.org/show_bug.cgi?id=137305
Reviewed by Darin Adler.
This was broken in http://trac.webkit.org/changeset/154970. To fix this (but not break
GStreamer), remove the "if (m_volumeInitialized)" check before updating the MediaPlayer's
volume to the value multiplied with the Page's mediaVolume. This should not affect GStreamer's
behavior because MediaPlayerPrivateGStreamerBase::setStreamVolumeElement does nothing unless
m_volumeInitialized is true.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updateVolume):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@175003 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Task-number: QTBUG-43479
Change-Id: I7f40dfc2535e2874d8c396051c488b7d92046919
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| -rw-r--r-- | Source/WebCore/html/HTMLMediaElement.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp index 6d5d6ee72..ea0fe4c4c 100644 --- a/Source/WebCore/html/HTMLMediaElement.cpp +++ b/Source/WebCore/html/HTMLMediaElement.cpp @@ -4002,8 +4002,7 @@ void HTMLMediaElement::updateVolume() } m_player->setMuted(shouldMute); - if (m_volumeInitialized) - m_player->setVolume(m_volume * volumeMultiplier); + m_player->setVolume(m_volume * volumeMultiplier); } if (hasMediaControls()) |