Hide overlay play button if it can't be shown without clipping

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

Index: third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp
index d6fc73e2cba1e9938c256dea9c22cc35d57d7312..d15ef68fc423ab48b52e111a6e4b650559a5c7ac 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp
@@ -160,10 +160,11 @@ class MediaControlsTest : public ::testing::Test {
         WebRemotePlaybackAvailability::DeviceAvailable);
   }
 
-  void ensureLayout() {
-    // Force a relayout, so that the controls know the width.  Otherwise,
-    // they don't know if, for example, the cast button will fit.
-    m_mediaControls->mediaElement().clientWidth();
+  void ensureSizing() {
+    // Fire the size-change callback to ensure that the controls have
+    // been properly notified of the video size.
+    m_mediaControls->notifyElementSizeChanged(
+        m_mediaControls->mediaElement().getBoundingClientRect());
   }
 
   void simulateHideMediaControlsTimerFired() {
@@ -234,7 +235,7 @@ TEST_F(MediaControlsTest, ResetDoesNotTriggerInitialLayout) {
 }
 
 TEST_F(MediaControlsTest, CastButtonRequiresRoute) {
-  ensureLayout();
+  ensureSizing();
   mediaControls().mediaElement().setBooleanAttribute(HTMLNames::controlsAttr,
                                                      true);
 
@@ -249,7 +250,7 @@ TEST_F(MediaControlsTest, CastButtonRequiresRoute) {
 }
 
 TEST_F(MediaControlsTest, CastButtonDisableRemotePlaybackAttr) {
-  ensureLayout();
+  ensureSizing();
   mediaControls().mediaElement().setBooleanAttribute(HTMLNames::controlsAttr,
                                                      true);
 
@@ -336,7 +337,7 @@ TEST_F(MediaControlsTest, KeepControlsVisibleIfOverflowListVisible) {
 }
 
 TEST_F(MediaControlsTest, DownloadButtonDisplayed) {
-  ensureLayout();
+  ensureSizing();
 
   Element* downloadButton = getElementByShadowPseudoId(
       mediaControls(), "-internal-media-controls-download-button");
@@ -351,7 +352,7 @@ TEST_F(MediaControlsTest, DownloadButtonDisplayed) {
 }
 
 TEST_F(MediaControlsTest, DownloadButtonNotDisplayedEmptyUrl) {
-  ensureLayout();
+  ensureSizing();
 
   Element* downloadButton = getElementByShadowPseudoId(
       mediaControls(), "-internal-media-controls-download-button");
@@ -365,7 +366,7 @@ TEST_F(MediaControlsTest, DownloadButtonNotDisplayedEmptyUrl) {
 }
 
 TEST_F(MediaControlsTest, DownloadButtonNotDisplayedInfiniteDuration) {
-  ensureLayout();
+  ensureSizing();
 
   Element* downloadButton = getElementByShadowPseudoId(
       mediaControls(), "-internal-media-controls-download-button");
@@ -382,7 +383,7 @@ TEST_F(MediaControlsTest, DownloadButtonNotDisplayedInfiniteDuration) {
 }
 
 TEST_F(MediaControlsTest, DownloadButtonNotDisplayedHLS) {
-  ensureLayout();
+  ensureSizing();
 
   Element* downloadButton = getElementByShadowPseudoId(
       mediaControls(), "-internal-media-controls-download-button");