Media Controls: take into consideration high margin on some elements.

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 713 matching lines @@
         m_muteButton.get(),
         m_volumeSlider.get(),
         m_toggleClosedCaptionsButton.get(),
         m_castButton.get(),
         m_currentTimeDisplay.get(),
         m_durationDisplay.get(),
     };
 
     int usedWidth = 0;
 
+    // TODO(mlamouri): we need a more dynamic way to find out the width of an
+    // element.
+    const int sliderMargin = 36; // Sliders have 18px margin on each side.
+
     // 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
     // we get this wrong before that.
     int minimumWidth = 48;
     if (m_playButton->layoutObject() && m_playButton->layoutObject()->style()) {
         const ComputedStyle* style = m_playButton->layoutObject()->style();
         minimumWidth = ceil(style->width().pixels() / style->effectiveZoom());
@@ skipping 21 matching lines @@
     m_overflowMenu->setIsWanted(true);
     usedWidth = minimumWidth;
 
     std::list<MediaControlElement*> overflowElements;
     MediaControlElement* firstDisplacedElement = nullptr;
     // For each control that fits, enable it in order of decreasing priority.
     bool droppedCastButton = false;
     for (MediaControlElement* element : elements) {
         if (!element)
             continue;
+        int width = minimumWidth;
+        if ((element == m_timeline.get()) || (element == m_volumeSlider.get()))
+            width += sliderMargin;
         element->shouldShowButtonInOverflowMenu(false);
         if (element->isWanted()) {
-            if (usedWidth + minimumWidth <= m_panelWidth) {
+            if (usedWidth + width <= m_panelWidth) {
                 element->setDoesFit(true);
-                usedWidth += minimumWidth;
+                usedWidth += width;
             } else {
                 element->setDoesFit(false);
+                // TODO(mlamouri): we should probably no longer mark the cast
+                // button as dropped, it should appear in the overflow menu.
                 if (element == m_castButton.get())
                     droppedCastButton = true;
                 element->shouldShowButtonInOverflowMenu(true);
                 if (element->hasOverflowButton())
                     overflowElements.push_front(element);
                 // We want a way to access the first media element that was
                 // removed. If we don't end up needing an overflow menu, we can
                 // use the space the overflow menu would have taken up to
                 // instead display that media element.
                 if (!element->hasOverflowButton() && !firstDisplacedElement)
                     firstDisplacedElement = element;
             }
         }
     }
 
     // If we don't have at least two overflow elements, we will not show the
     // overflow menu.
     if (overflowElements.empty()) {
         m_overflowMenu->setIsWanted(false);
-        if (firstDisplacedElement)
-            firstDisplacedElement->setDoesFit(true);
+        usedWidth -= minimumWidth;
+        if (firstDisplacedElement) {
+            int width = minimumWidth;
+            if ((firstDisplacedElement == m_timeline.get()) || (firstDisplacedElement == m_volumeSlider.get()))
+                width += sliderMargin;
+            if (usedWidth + width <= m_panelWidth)
+                firstDisplacedElement->setDoesFit(true);
+        }
     } else if (overflowElements.size() == 1) {
         m_overflowMenu->setIsWanted(false);
         overflowElements.front()->setDoesFit(true);
     }
 
     // Special case for cast: if we want a cast button but dropped it, then
     // show the overlay cast button instead.
     if (m_castButton->isWanted()) {
         if (droppedCastButton)
             m_overlayCastButton->tryShowOverlay();
@@ skipping 58 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