Reordering media controls.

third_party/WebKit/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 205 matching lines @@
     MediaControlMuteButtonElement* muteButton = MediaControlMuteButtonElement::create(*this);
     m_muteButton = muteButton;
     panel->appendChild(muteButton);
 
     MediaControlVolumeSliderElement* slider = MediaControlVolumeSliderElement::create(*this);
     m_volumeSlider = slider;
     panel->appendChild(slider);
     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);
 
     MediaControlDownloadButtonElement* downloadButton = MediaControlDownloadButtonElement::create(*this);
     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);
 
     m_enclosure = enclosure;
     appendChild(enclosure);
 
     MediaControlTextTrackListElement* textTrackList = MediaControlTextTrackListElement::create(*this);
     m_textTrackList = textTrackList;
     appendChild(textTrackList);
 
     MediaControlOverflowMenuButtonElement* overflowMenu = MediaControlOverflowMenuButtonElement::create(*this);
     m_overflowMenu = overflowMenu;
     panel->appendChild(overflowMenu);
 
     MediaControlOverflowMenuListElement* overflowList = MediaControlOverflowMenuListElement::create(*this);
     m_overflowList = overflowList;
     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()
 {
     EventDispatchForbiddenScope::AllowUserAgentEvents allowEventsInShadow;
     const bool useNewUi = RuntimeEnabledFeatures::newMediaPlaybackUiEnabled();
     BatchedControlUpdate batch(this);
 
     m_allowHiddenVolumeControls = useNewUi;
 
@@ skipping 432 matching lines @@
 
     if (!RuntimeEnabledFeatures::newMediaPlaybackUiEnabled())
         return;
 
     // Controls that we'll hide / show, in order of decreasing priority.
     MediaControlElement* elements[] = {
         // Exclude m_overflowMenu; we handle it specially.
         m_playButton.get(),
         m_fullscreenButton.get(),
         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_muteButton.get(),
+        m_volumeSlider.get(),
+        m_toggleClosedCaptionsButton.get(),
+        m_castButton.get(),
         m_currentTimeDisplay.get(),
-        m_volumeSlider.get(),
-        m_castButton.get(),
-        m_muteButton.get(),
         m_durationDisplay.get(),
     };
 
     int usedWidth = 0;
 
     // Assume that all controls require 48px, unless we can get the computed
     // style for the play button.  Since the play button or overflow is always
     // shown, one of the two buttons should be available the first time we're
     // called after layout.  This will
     // also be the first time we have m_panelWidth!=0, so it won't matter if
@@ skipping 131 matching lines @@
     visitor->trace(m_enclosure);
     visitor->trace(m_textTrackList);
     visitor->trace(m_overflowMenu);
     visitor->trace(m_overflowList);
     visitor->trace(m_castButton);
     visitor->trace(m_overlayCastButton);
     HTMLDivElement::trace(visitor);
 }
 
 } // namespace blink