Reordering media controls.

third_party/WebKit/Source/core/html/shadow/MediaControls.cpp

Index: third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
index 07680f612b45c082052028ebb7049fbafde1689b..234bb80063a62c3d55c98916f3e68424421cef89 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
@@ -223,14 +223,6 @@ void MediaControls::initializeControls()
     if (m_allowHiddenVolumeControls && preferHiddenVolumeControls(document()))
         m_volumeSlider->setIsWanted(false);
 
-    MediaControlToggleClosedCaptionsButtonElement* toggleClosedCaptionsButton = MediaControlToggleClosedCaptionsButtonElement::create(*this);
-    m_toggleClosedCaptionsButton = toggleClosedCaptionsButton;
-    panel->appendChild(toggleClosedCaptionsButton);
-
-    MediaControlCastButtonElement* castButton = MediaControlCastButtonElement::create(*this, false);
-    m_castButton = castButton;
-    panel->appendChild(castButton);
-
     MediaControlFullscreenButtonElement* fullscreenButton = MediaControlFullscreenButtonElement::create(*this);
     m_fullscreenButton = fullscreenButton;
     panel->appendChild(fullscreenButton);
@@ -239,6 +231,14 @@ void MediaControls::initializeControls()
     m_downloadButton = downloadButton;
     panel->appendChild(downloadButton);
 
+    MediaControlCastButtonElement* castButton = MediaControlCastButtonElement::create(*this, false);
+    m_castButton = castButton;
+    panel->appendChild(castButton);
+
+    MediaControlToggleClosedCaptionsButtonElement* toggleClosedCaptionsButton = MediaControlToggleClosedCaptionsButtonElement::create(*this);
+    m_toggleClosedCaptionsButton = toggleClosedCaptionsButton;
+    panel->appendChild(toggleClosedCaptionsButton);
+
     m_panel = panel;
     enclosure->appendChild(panel);
 
@@ -258,12 +258,12 @@ void MediaControls::initializeControls()
     appendChild(overflowList);
 
     // The order in which we append elements to the overflow list does matter.

[whywhat, 2016/09/16 14:18:55]

nit: perhaps explain _how_ it matters. That the last appended item will go into
the overflow menu first when the element narrows (and the last two appended
items go together).

[kdsilva, 2016/09/16 15:25:03]

Done.

+    m_overflowList->appendChild(m_playButton->createOverflowElement(*this, MediaControlPlayButtonElement::create(*this)));
+    m_overflowList->appendChild(m_fullscreenButton->createOverflowElement(*this, MediaControlFullscreenButtonElement::create(*this)));
+    m_overflowList->appendChild(m_downloadButton->createOverflowElement(*this, MediaControlDownloadButtonElement::create(*this)));
     m_overflowList->appendChild(m_muteButton->createOverflowElement(*this, MediaControlMuteButtonElement::create(*this)));
     m_overflowList->appendChild(m_castButton->createOverflowElement(*this, MediaControlCastButtonElement::create(*this, false)));
     m_overflowList->appendChild(m_toggleClosedCaptionsButton->createOverflowElement(*this, MediaControlToggleClosedCaptionsButtonElement::create(*this)));
-    m_overflowList->appendChild(m_fullscreenButton->createOverflowElement(*this, MediaControlFullscreenButtonElement::create(*this)));
-    m_overflowList->appendChild(m_playButton->createOverflowElement(*this, MediaControlPlayButtonElement::create(*this)));
-    m_overflowList->appendChild(m_downloadButton->createOverflowElement(*this, MediaControlDownloadButtonElement::create(*this)));
 }
 
 void MediaControls::reset()
@@ -718,10 +718,11 @@ void MediaControls::computeWhichControlsFit()
         m_downloadButton.get(),
         m_toggleClosedCaptionsButton.get(),

[whywhat, 2016/09/16 14:18:55]

nit: forgot to delete this one?

[kdsilva, 2016/09/16 15:25:03]

Done.

         m_timeline.get(),
-        m_currentTimeDisplay.get(),
+        m_muteButton.get(),
         m_volumeSlider.get(),
+        m_toggleClosedCaptionsButton.get(),
         m_castButton.get(),
-        m_muteButton.get(),
+        m_currentTimeDisplay.get(),
         m_durationDisplay.get(),
     };