diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 23:48:29 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 23:48:29 +0000 |
commit | 835070f43aee5c0321093373258ca847c64576ce (patch) | |
tree | d896fb4fa233c943001c2609df6452337259e724 /webkit | |
parent | 12955882025c17d020721c4e2e916ad4011c8718 (diff) | |
download | chromium_src-835070f43aee5c0321093373258ca847c64576ce.zip chromium_src-835070f43aee5c0321093373258ca847c64576ce.tar.gz chromium_src-835070f43aee5c0321093373258ca847c64576ce.tar.bz2 |
Set the correct volume when media is loaded.
Before we were ignoring any volume values set prior to load(), leading to a mismatch between what the element was reporting and what people were hearing on their speakers.
Patch by simonjam@google.com:
http://codereview.chromium.org/2051008/show
BUG=33023
TEST=set volume on media element, then call load(), volume should be properly set
Review URL: http://codereview.chromium.org/2123006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index d3ef789..f066cc7 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -250,6 +250,9 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) { DCHECK(MessageLoop::current() == main_loop_); DCHECK(proxy_); + // Handle any volume changes that occured before load(). + setVolume(GetClient()->volume()); + // Initialize the pipeline. SetNetworkState(WebKit::WebMediaPlayer::Loading); SetReadyState(WebKit::WebMediaPlayer::HaveNothing); |