[m48 merge] Remove clientWidth call during MediaControls::reset.

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 242 matching lines @@
     m_timeline->setDuration(duration);
     m_timeline->setPosition(mediaElement().currentTime());
 
     updateVolume();
 
     refreshClosedCaptionsButtonVisibility();
 
     m_fullScreenButton->setIsWanted(shouldShowFullscreenButton(mediaElement()));
 
     refreshCastButtonVisibilityWithoutUpdate();
-
-    // Set the panel width here, and force a layout, before the controls update.
-    // This would be harmless for the !useNewUi case too, but it causes
-    // compositing/geometry/video-fixed-scrolling.html to fail with two extra
-    // 0 height nodes in the render tree.
-    if (useNewUi)
-        m_panelWidth = m_panel->clientWidth();
 }
 
 LayoutObject* MediaControls::layoutObjectForTextTrackLayout()
 {
     return m_panel->layoutObject();
 }
 
 void MediaControls::show()
 {
     makeOpaque();
@@ skipping 365 matching lines @@
 
 void MediaControls::computeWhichControlsFit()
 {
     // Hide all controls that don't fit, and show the ones that do.
     // This might be better suited for a layout, but since JS media controls
     // won't benefit from that anwyay, we just do it here like JS will.
 
     if (!RuntimeEnabledFeatures::newMediaPlaybackUiEnabled())
         return;
 
-    if (!m_panelWidth)
-        return;
-
     // Controls that we'll hide / show, in order of decreasing priority.
     MediaControlElement* elements[] = {
         m_playButton.get(),
         m_toggleClosedCaptionsButton.get(),
         m_fullScreenButton.get(),
         m_timeline.get(),
         m_currentTimeDisplay.get(),
         m_volumeSlider.get(),
         m_castButton.get(),
         m_muteButton.get(),
         m_durationDisplay.get(),
     };
 
+    if (!m_panelWidth) {
+        // No layout yet -- hide everything, then make them show up later.
+        // This prevents the wrong controls from being shown briefly
+        // immediately after the first layout and paint, but before we have
+        // a chance to revise them.
+        for (MediaControlElement* element : elements) {
+            if (element)
+                element->setDoesFit(false);
+        }
+        return;
+    }
+
     int usedWidth = 0;
     bool droppedCastButton = false;
     // Assume that all controls require 48px.  Ideally, we could get this
     // the computed style, but that requires the controls to be shown.
     const int minimumWidth = 48;
     for (MediaControlElement* element : elements) {
         if (!element)
             continue;
 
         if (element->isWanted()) {
@@ skipping 58 matching lines @@
     visitor->trace(m_toggleClosedCaptionsButton);
     visitor->trace(m_fullScreenButton);
     visitor->trace(m_durationDisplay);
     visitor->trace(m_enclosure);
     visitor->trace(m_castButton);
     visitor->trace(m_overlayCastButton);
     HTMLDivElement::trace(visitor);
 }
 
 }