Merge/rename two MediaControlElements into their parent classes

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 26 matching lines @@
 static const double timeWithoutMouseMovementBeforeHidingFullscreenControls = 3;
 
 MediaControls::MediaControls(Document& document)
     : HTMLDivElement(document)
     , m_mediaController(0)
     , m_panel(0)
     , m_textDisplayContainer(0)
     , m_playButton(0)
     , m_currentTimeDisplay(0)
     , m_timeline(0)
-    , m_panelMuteButton(0)
+    , m_muteButton(0)
     , m_volumeSlider(0)
     , m_toggleClosedCaptionsButton(0)
     , m_fullScreenButton(0)
     , m_durationDisplay(0)
     , m_enclosure(0)
     , m_hideFullscreenControlsTimer(this, &MediaControls::hideFullscreenControlsTimerFired)
     , m_isFullscreen(false)
     , m_isMouseOverControls(false)
 {
 }
@@ skipping 43 matching lines @@
     panel->appendChild(currentTimeDisplay.release(), exceptionState);
     if (exceptionState.hadException())
         return false;
 
     RefPtr<MediaControlTimeRemainingDisplayElement> durationDisplay = MediaControlTimeRemainingDisplayElement::create(document);
     m_durationDisplay = durationDisplay.get();
     panel->appendChild(durationDisplay.release(), exceptionState);
     if (exceptionState.hadException())
         return false;
 
-    RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, this);
-    m_panelMuteButton = panelMuteButton.get();
-    panel->appendChild(panelMuteButton.release(), exceptionState);
+    RefPtr<MediaControlMuteButtonElement> muteButton = MediaControlMuteButtonElement::create(document);
+    m_muteButton = muteButton.get();
+    panel->appendChild(muteButton.release(), exceptionState);
     if (exceptionState.hadException())
         return false;
 
-    RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolumeSliderElement::create(document);
+    RefPtr<MediaControlVolumeSliderElement> slider = MediaControlVolumeSliderElement::create(document);
     m_volumeSlider = slider.get();
     panel->appendChild(slider.release(), exceptionState);
     if (exceptionState.hadException())
         return false;
 
     RefPtr<MediaControlToggleClosedCaptionsButtonElement> toggleClosedCaptionsButton = MediaControlToggleClosedCaptionsButtonElement::create(document, this);
     m_toggleClosedCaptionsButton = toggleClosedCaptionsButton.get();
     panel->appendChild(toggleClosedCaptionsButton.release(), exceptionState);
     if (exceptionState.hadException())
         return false;
@@ skipping 22 matching lines @@
     if (m_mediaController == controller)
         return;
     m_mediaController = controller;
 
     m_panel->setMediaController(controller);
     if (m_textDisplayContainer)
         m_textDisplayContainer->setMediaController(controller);
     m_playButton->setMediaController(controller);
     m_currentTimeDisplay->setMediaController(controller);
     m_timeline->setMediaController(controller);
-    m_panelMuteButton->setMediaController(controller);
+    m_muteButton->setMediaController(controller);
     m_volumeSlider->setMediaController(controller);
     m_toggleClosedCaptionsButton->setMediaController(controller);
     m_fullScreenButton->setMediaController(controller);
     m_durationDisplay->setMediaController(controller);
     m_enclosure->setMediaController(controller);
 }
 
 void MediaControls::reset()
 {
     Page* page = document().page();
     if (!page)
         return;
 
     double duration = m_mediaController->duration();
     m_durationDisplay->setInnerText(RenderTheme::theme().formatMediaControlsTime(duration), ASSERT_NO_EXCEPTION);
     m_durationDisplay->setCurrentValue(duration);
 
     m_playButton->updateDisplayType();
 
     updateCurrentTimeDisplay();
 
     m_timeline->setDuration(m_mediaController->duration());
     m_timeline->setPosition(m_mediaController->currentTime());
 
-    m_panelMuteButton->show();
-
     if (!m_mediaController->hasAudio()) {
         m_volumeSlider->hide();
     } else {
         m_volumeSlider->show();
         m_volumeSlider->setVolume(m_mediaController->volume());
     }
 
     refreshClosedCaptionsButtonVisibility();
 
     if (m_mediaController->hasVideo())
@@ skipping 87 matching lines @@
         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()
 {
-    m_panelMuteButton->changedMute();
+    m_muteButton->updateDisplayType();
 
     if (m_mediaController->muted())
         m_volumeSlider->setVolume(0);
     else
         m_volumeSlider->setVolume(m_mediaController->volume());
 }
 
 void MediaControls::changedVolume()
 {
     m_volumeSlider->setVolume(m_mediaController->volume());
-    if (m_panelMuteButton->renderer())
-        m_panelMuteButton->renderer()->repaint();
+    if (m_muteButton->renderer())
+        m_muteButton->renderer()->repaint();
 }
 
 void MediaControls::changedClosedCaptionsVisibility()
 {
     m_toggleClosedCaptionsButton->updateDisplayType();
 }
 
 void MediaControls::refreshClosedCaptionsButtonVisibility()
 {
     if (m_mediaController->hasClosedCaptions())
@@ skipping 139 matching lines @@
     m_textDisplayContainer->updateDisplay();
 }
 
 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement> textTrackContainer)
 {
     // Insert it before the first controller element so it always displays behind the controls.
     insertBefore(textTrackContainer, m_enclosure);
 }
 
 }