Merge 116900 - Volume slider needs to be displayed below the mute button

Source/WebCore/html/shadow/MediaControlRootElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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 168 matching lines @@
 
     if (document->page()->theme()->usesMediaControlVolumeSlider()) {
         RefPtr<MediaControlVolumeSliderContainerElement> volumeSliderContainer = MediaControlVolumeSliderContainerElement::create(document);
 
         RefPtr<MediaControlVolumeSliderElement> slider = MediaControlVolumeSliderElement::create(document);
         controls->m_volumeSlider = slider.get();
         volumeSliderContainer->appendChild(slider.release(), ec, true);
         if (ec)
             return 0;
 
+        // This is a duplicate mute button, which is visible in some ports at the bottom of the volume bar.
+        // It's important only when the volume bar is displayed below the controls.
+        RefPtr<MediaControlVolumeSliderMuteButtonElement> volumeSliderMuteButton = MediaControlVolumeSliderMuteButtonElement::create(document);
+        controls->m_volumeSliderMuteButton = volumeSliderMuteButton.get();
+        volumeSliderContainer->appendChild(volumeSliderMuteButton.release(), ec, true);
+
+        if (ec)
+            return 0;
+
         controls->m_volumeSliderContainer = volumeSliderContainer.get();
         panelVolumeControlContainer->appendChild(volumeSliderContainer.release(), ec, true);
         if (ec)
             return 0;
     }
 
     RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
     controls->m_panelMuteButton = panelMuteButton.get();
     panelVolumeControlContainer->appendChild(panelMuteButton.release(), ec, true);
     if (ec)
@@ skipping 451 matching lines @@
 {
     // We only need to update buffering progress when paused, during normal
     // playback playbackProgressed() will take care of it.
     if (m_mediaController->paused())
         m_timeline->setPosition(m_mediaController->currentTime());
 }
 
 }
 
 #endif