Let the effective media volume be 0 if the media element is muted

Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 3269 matching lines @@
 {
     if (webMediaPlayer())
         webMediaPlayer()->setVolume(playerVolume());
 
     if (hasMediaControls())
         mediaControls()->updateVolume();
 }
 
 double HTMLMediaElement::playerVolume() const
 {
-    double volumeMultiplier = 1;
-    bool shouldMute = m_muted;
+    // Spec reference: http://whatwg.org/c#effective-media-volume
 
-    if (m_mediaController) {
-        volumeMultiplier *= m_mediaController->volume();
-        shouldMute = m_mediaController->muted();

[acolwell GONE FROM CHROMIUM, 2014/08/06 23:51:05]

So is the bug here then? IIUC the media controller can be "not-muted" eventhough
the media element is muted?

[philipj_slow, 2014/08/07 07:34:23]

Precisely, the media element's and the media controller's script-visible muted
state are independent, so the bug was with a muted media element and unmuted
media controller.

-    }
+    if (m_muted)
+        return 0;
 
-    return shouldMute ? 0 : m_volume * volumeMultiplier;
+    if (m_mediaController && m_mediaController->muted())
+        return 0;
+
+    double volume = m_volume;
+
+    if (m_mediaController)
+        volume *= m_mediaController->volume();
+
+    return volume;
 }
 
 void HTMLMediaElement::updatePlayState()
 {
     if (!m_player)
         return;
 
     bool isPlaying = webMediaPlayer() && !webMediaPlayer()->paused();
     if (m_pausedInternal) {
         if (isPlaying)
@@ skipping 675 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(0);
 }
 #endif
 
 }