Enable mute button, even if preferring hidden volume slider.

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 100 matching lines @@
     , m_toggleClosedCaptionsButton(nullptr)
     , m_castButton(nullptr)
     , m_fullScreenButton(nullptr)
     , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired)
     , m_hideTimerBehaviorFlags(IgnoreNone)
     , m_isMouseOverControls(false)
     , m_isPausedForScrubbing(false)
     , m_panelWidthChangedTimer(this, &MediaControls::panelWidthChangedTimerFired)
     , m_panelWidth(0)
     , m_allowHiddenVolumeControls(RuntimeEnabledFeatures::newMediaPlaybackUiEnabled())
-    , m_keepMuteButton(false)
 {
 }
 
 PassRefPtrWillBeRawPtr<MediaControls> MediaControls::create(HTMLMediaElement& mediaElement)
 {
     RefPtrWillBeRawPtr<MediaControls> controls = adoptRefWillBeNoop(new MediaControls(mediaElement));
     controls->setShadowPseudoId(AtomicString("-webkit-media-controls", AtomicString::ConstructFromLiteral));
     controls->initializeControls();
     return controls.release();
 }
@@ skipping 62 matching lines @@
     m_durationDisplay = durationDisplay.get();
     panel->appendChild(durationDisplay.release());
 
     // Timeline is after the time / duration text if newMediaPlaybackUiEnabled.
     if (useNewUi)
         panel->appendChild(timeline.release());
 
     RefPtrWillBeRawPtr<MediaControlMuteButtonElement> muteButton = MediaControlMuteButtonElement::create(*this);
     m_muteButton = muteButton.get();
     panel->appendChild(muteButton.release());
-    if (m_allowHiddenVolumeControls && preferHiddenVolumeControls(document()))
-        m_muteButton->setIsWanted(false);
 
     RefPtrWillBeRawPtr<MediaControlVolumeSliderElement> slider = MediaControlVolumeSliderElement::create(*this);
     m_volumeSlider = slider.get();
     panel->appendChild(slider.release());
     if (m_allowHiddenVolumeControls && preferHiddenVolumeControls(document()))
         m_volumeSlider->setIsWanted(false);
 
     RefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> toggleClosedCaptionsButton = MediaControlToggleClosedCaptionsButtonElement::create(*this);
     m_toggleClosedCaptionsButton = toggleClosedCaptionsButton.get();
     panel->appendChild(toggleClosedCaptionsButton.release());
@@ skipping 12 matching lines @@
     m_enclosure = enclosure.get();
     appendChild(enclosure.release());
 }
 
 void MediaControls::reset()
 {
     const bool useNewUi = RuntimeEnabledFeatures::newMediaPlaybackUiEnabled();
     BatchedControlUpdate batch(this);
 
     m_allowHiddenVolumeControls = useNewUi;
-    m_keepMuteButton = false;
 
     const double duration = mediaElement().duration();
     m_durationDisplay->setInnerText(LayoutTheme::theme().formatMediaControlsTime(duration), ASSERT_NO_EXCEPTION);
     m_durationDisplay->setCurrentValue(duration);
 
     if (useNewUi) {
         // Show everything that we might hide.
         // If we don't have a duration, then mark it to be hidden.  For the
         // old UI case, want / don't want is the same as show / hide since
         // it is never marked as not fitting.
@@ skipping 187 matching lines @@
     BatchedControlUpdate batch(this);
     m_volumeSlider->setIsWanted(mediaElement().hasAudio()
         && !(m_allowHiddenVolumeControls && preferHiddenVolumeControls(document())));
 
     // The mute button is a little more complicated.  If enableNewMediaPlaybackUi
     // is true, then we choose to hide or show the mute button to save space.
     // If enableNew* is not set, then we never touch the mute button, and
     // instead leave it to the CSS.
     // Note that this is why m_allowHiddenVolumeControls isn't rolled into prefer...().
     if (m_allowHiddenVolumeControls) {
-        // If there is no audio track, then hide the mute button.  If there
-        // is an audio track, then we always show the mute button unless
-        // we prefer to hide it and the media isn't muted.  If it's muted,
-        // then we show it to let the user unmute it.  In this case, we don't
-        // want to re-hide the mute button later.
-        m_keepMuteButton |= mediaElement().muted();
-        m_muteButton->setIsWanted(mediaElement().hasAudio()
-            && (!preferHiddenVolumeControls(document()) || m_keepMuteButton));
+        // If there is no audio track, then hide the mute button.
+        m_muteButton->setIsWanted(mediaElement().hasAudio());
     }
 
     // Invalidate the volume slider because it paints differently according to volume.
     if (LayoutObject* layoutObject = m_volumeSlider->layoutObject())
         layoutObject->setShouldDoFullPaintInvalidation();
 }
 
 void MediaControls::changedClosedCaptionsVisibility()
 {
     m_toggleClosedCaptionsButton->updateDisplayType();
@@ skipping 258 matching lines @@
 
     // Special case for cast: if we want a cast button but dropped it, then
     // show the overlay cast button instead.
     if (m_castButton->isWanted())
         m_overlayCastButton->setIsWanted(droppedCastButton);
 }
 
 void MediaControls::setAllowHiddenVolumeControls(bool allow)
 {
     m_allowHiddenVolumeControls = allow;
-    // Clear the 'keep muted flag', for tests.
-    m_keepMuteButton = false;
     // Update the controls visibility.
     updateVolume();
 }
 
 DEFINE_TRACE(MediaControls)
 {
     visitor->trace(m_mediaElement);
     visitor->trace(m_panel);
     visitor->trace(m_overlayPlayButton);
     visitor->trace(m_overlayEnclosure);
     visitor->trace(m_playButton);
     visitor->trace(m_currentTimeDisplay);
     visitor->trace(m_timeline);
     visitor->trace(m_muteButton);
     visitor->trace(m_volumeSlider);
     visitor->trace(m_toggleClosedCaptionsButton);
     visitor->trace(m_fullScreenButton);
     visitor->trace(m_durationDisplay);
     visitor->trace(m_enclosure);
     visitor->trace(m_castButton);
     visitor->trace(m_overlayCastButton);
     HTMLDivElement::trace(visitor);
 }
 
 }