Ignore MediaController in the muted/volume controls logic

Source/core/html/shadow/MediaControls.cpp

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google 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
@@ skipping 165 matching lines @@
     m_durationDisplay->setInnerText(RenderTheme::theme().formatMediaControlsTime(duration), ASSERT_NO_EXCEPTION);
     m_durationDisplay->setCurrentValue(duration);
 
     updatePlayState();
 
     updateCurrentTimeDisplay();
 
     m_timeline->setDuration(mediaControllerInterface().duration());
     m_timeline->setPosition(mediaControllerInterface().currentTime());
 
-    if (!mediaControllerInterface().hasAudio()) {
+    if (!mediaElement().hasAudio())
         m_volumeSlider->hide();
-    } else {
+    else
         m_volumeSlider->show();
-        m_volumeSlider->setVolume(mediaControllerInterface().volume());
-    }
+    updateVolume();
 
     refreshClosedCaptionsButtonVisibility();
 
     if (mediaElement().hasVideo())
         m_fullScreenButton->show();
     else
         m_fullScreenButton->hide();
 
     makeOpaque();
 }
@@ skipping 94 matching lines @@
     if (now > 0) {
         m_currentTimeDisplay->show();
         m_durationDisplay->hide();
     }
 
     // Allow the theme to format the time.
     m_currentTimeDisplay->setInnerText(RenderTheme::theme().formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
     m_currentTimeDisplay->setCurrentValue(now);
 }
 
-void MediaControls::changedMute()
+void MediaControls::updateVolume()
 {
     m_muteButton->updateDisplayType();
+    if (m_muteButton->renderer())
+        m_muteButton->renderer()->repaint();
 
-    if (mediaControllerInterface().muted())
+    if (mediaElement().muted())
         m_volumeSlider->setVolume(0);
     else
-        m_volumeSlider->setVolume(mediaControllerInterface().volume());
-}
-
-void MediaControls::changedVolume()
-{
-    m_volumeSlider->setVolume(mediaControllerInterface().volume());
-    if (m_muteButton->renderer())
-        m_muteButton->renderer()->repaint();
+        m_volumeSlider->setVolume(mediaElement().volume());
 }
 
 void MediaControls::changedClosedCaptionsVisibility()
 {
     m_toggleClosedCaptionsButton->updateDisplayType();
 }
 
 void MediaControls::refreshClosedCaptionsButtonVisibility()
 {
     if (mediaElement().hasClosedCaptions())
@@ skipping 131 matching lines @@
 
 void MediaControls::updateTextTrackDisplay()
 {
     if (!m_textDisplayContainer)
         createTextTrackDisplay();
 
     m_textDisplayContainer->updateDisplay();
 }
 
 }