Move a few media controls elements into modules/media_controls/elements/.

third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.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 28 matching lines @@
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/media/HTMLMediaElementControlsList.h"
 #include "core/html/track/TextTrackContainer.h"
 #include "core/html/track/TextTrackList.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTheme.h"
 #include "modules/media_controls/MediaControlsMediaEventListener.h"
 #include "modules/media_controls/MediaControlsOrientationLockDelegate.h"
 #include "modules/media_controls/MediaControlsWindowEventListener.h"
+#include "modules/media_controls/elements/MediaControlMuteButtonElement.h"
+#include "modules/media_controls/elements/MediaControlOverlayEnclosureElement.h"
+#include "modules/media_controls/elements/MediaControlPanelEnclosureElement.h"
 #include "platform/EventDispatchForbiddenScope.h"
 
 namespace blink {
 
 namespace {
 
 // TODO(steimel): should have better solution than hard-coding pixel values.
 // Defined in core/css/mediaControls.css, core/css/mediaControlsAndroid.css,
 // and core/paint/MediaControlsPainter.cpp.
 constexpr int kOverlayPlayButtonWidth = 48;
@@ skipping 228 matching lines @@
 // | {for each renderable text track}
 //  \-MediaControlTextTrackListItem
 //  |   (-internal-media-controls-text-track-list-item)
 //  +-MediaControlTextTrackListItemInput
 //  |    (-internal-media-controls-text-track-list-item-input)
 //  +-MediaControlTextTrackListItemCaptions
 //  |    (-internal-media-controls-text-track-list-kind-captions)
 //  +-MediaControlTextTrackListItemSubtitles
 //       (-internal-media-controls-text-track-list-kind-subtitles)
 void MediaControlsImpl::InitializeControls() {
-  MediaControlOverlayEnclosureElement* overlay_enclosure =
-      MediaControlOverlayEnclosureElement::Create(*this);
+  overlay_enclosure_ = new MediaControlOverlayEnclosureElement(*this);
 
   if (RuntimeEnabledFeatures::mediaControlsOverlayPlayButtonEnabled()) {
     MediaControlOverlayPlayButtonElement* overlay_play_button =
         MediaControlOverlayPlayButtonElement::Create(*this);
     overlay_play_button_ = overlay_play_button;
-    overlay_enclosure->AppendChild(overlay_play_button);
+    overlay_enclosure_->AppendChild(overlay_play_button);
   }
 
   MediaControlCastButtonElement* overlay_cast_button =
       MediaControlCastButtonElement::Create(*this, true);
   overlay_cast_button_ = overlay_cast_button;
-  overlay_enclosure->AppendChild(overlay_cast_button);
+  overlay_enclosure_->AppendChild(overlay_cast_button);
 
-  overlay_enclosure_ = overlay_enclosure;
-  AppendChild(overlay_enclosure);
+  AppendChild(overlay_enclosure_);
 
   // Create an enclosing element for the panel so we can visually offset the
   // controls correctly.
-  MediaControlPanelEnclosureElement* enclosure =
-      MediaControlPanelEnclosureElement::Create(*this);
+  enclosure_ = new MediaControlPanelEnclosureElement(*this);
 
   MediaControlPanelElement* panel = MediaControlPanelElement::Create(*this);
 
   MediaControlPlayButtonElement* play_button =
       MediaControlPlayButtonElement::Create(*this);
   play_button_ = play_button;
   panel->AppendChild(play_button);
 
   MediaControlCurrentTimeDisplayElement* current_time_display =
       MediaControlCurrentTimeDisplayElement::Create(*this);
   current_time_display_ = current_time_display;
   current_time_display_->SetIsWanted(true);
   panel->AppendChild(current_time_display);
 
   MediaControlTimeRemainingDisplayElement* duration_display =
       MediaControlTimeRemainingDisplayElement::Create(*this);
   duration_display_ = duration_display;
   panel->AppendChild(duration_display);
 
   MediaControlTimelineElement* timeline =
       MediaControlTimelineElement::Create(*this);
   timeline_ = timeline;
   panel->AppendChild(timeline);
 
-  MediaControlMuteButtonElement* mute_button =
-      MediaControlMuteButtonElement::Create(*this);
-  mute_button_ = mute_button;
-  panel->AppendChild(mute_button);
+  mute_button_ = new MediaControlMuteButtonElement(*this);
+  panel->AppendChild(mute_button_);
 
   MediaControlVolumeSliderElement* slider =
       MediaControlVolumeSliderElement::Create(*this);
   volume_slider_ = slider;
   panel->AppendChild(slider);
   if (PreferHiddenVolumeControls(GetDocument()))
     volume_slider_->SetIsWanted(false);
 
   MediaControlFullscreenButtonElement* fullscreen_button =
       MediaControlFullscreenButtonElement::Create(*this);
   fullscreen_button_ = fullscreen_button;
   panel->AppendChild(fullscreen_button);
 
   MediaControlDownloadButtonElement* download_button =
       MediaControlDownloadButtonElement::Create(*this);
   download_button_ = download_button;
   panel->AppendChild(download_button);
 
   MediaControlCastButtonElement* cast_button =
       MediaControlCastButtonElement::Create(*this, false);
   cast_button_ = cast_button;
   panel->AppendChild(cast_button);
 
   MediaControlToggleClosedCaptionsButtonElement* toggle_closed_captions_button =
       MediaControlToggleClosedCaptionsButtonElement::Create(*this);
   toggle_closed_captions_button_ = toggle_closed_captions_button;
   panel->AppendChild(toggle_closed_captions_button);
 
   panel_ = panel;
-  enclosure->AppendChild(panel);
+  enclosure_->AppendChild(panel);
 
-  enclosure_ = enclosure;
-  AppendChild(enclosure);
+  AppendChild(enclosure_);
 
   MediaControlTextTrackListElement* text_track_list =
       MediaControlTextTrackListElement::Create(*this);
   text_track_list_ = text_track_list;
   AppendChild(text_track_list);
 
   MediaControlOverflowMenuButtonElement* overflow_menu =
       MediaControlOverflowMenuButtonElement::Create(*this);
   overflow_menu_ = overflow_menu;
   panel->AppendChild(overflow_menu);
 
   MediaControlOverflowMenuListElement* overflow_list =
       MediaControlOverflowMenuListElement::Create(*this);
   overflow_list_ = overflow_list;
   AppendChild(overflow_list);
 
   // The order in which we append elements to the overflow list is significant
   // because it determines how the elements show up in the overflow menu
   // relative to each other.  The first item appended appears at the top of the
   // overflow menu.
   overflow_list_->AppendChild(play_button_->CreateOverflowElement(
       *this, MediaControlPlayButtonElement::Create(*this)));
   overflow_list_->AppendChild(fullscreen_button_->CreateOverflowElement(
       *this, MediaControlFullscreenButtonElement::Create(*this)));
   overflow_list_->AppendChild(download_button_->CreateOverflowElement(
       *this, MediaControlDownloadButtonElement::Create(*this)));
   overflow_list_->AppendChild(mute_button_->CreateOverflowElement(
-      *this, MediaControlMuteButtonElement::Create(*this)));
+      *this, new MediaControlMuteButtonElement(*this)));
   overflow_list_->AppendChild(cast_button_->CreateOverflowElement(
       *this, MediaControlCastButtonElement::Create(*this, false)));
   overflow_list_->AppendChild(
       toggle_closed_captions_button_->CreateOverflowElement(
           *this, MediaControlToggleClosedCaptionsButtonElement::Create(*this)));
 }
 
 Node::InsertionNotificationRequest MediaControlsImpl::InsertedInto(
     ContainerNode* root) {
   if (!MediaElement().isConnected())
@@ skipping 721 matching lines @@
   visitor->Trace(cast_button_);
   visitor->Trace(overlay_cast_button_);
   visitor->Trace(media_event_listener_);
   visitor->Trace(window_event_listener_);
   visitor->Trace(orientation_lock_delegate_);
   MediaControls::Trace(visitor);
   HTMLDivElement::Trace(visitor);
 }
 
 }  // namespace blink