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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/html/shadow/MediaControls.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/StylePropertySet.h"
 #include "core/dom/Document.h"
@@ skipping 38 matching lines @@
     return true;
 }
 
 } // namespace
 
 class MediaControlsTest : public testing::Test {
 protected:
     virtual void SetUp()
     {
         m_pageHolder = DummyPageHolder::create(IntSize(800, 600));
-        Document& document = m_pageHolder->document();
+        Document& document = this->document();
         document.write("<video controls>");
         HTMLVideoElement& video = toHTMLVideoElement(*document.querySelector("video", ASSERT_NO_EXCEPTION));
         m_mediaControls = video.mediaControls();
     }
 
     MediaControls& mediaControls() { return *m_mediaControls; }
+    Document& document() { return m_pageHolder->document(); }
 
 private:
     OwnPtr<DummyPageHolder> m_pageHolder;
     MediaControls* m_mediaControls;
 };
 
 TEST_F(MediaControlsTest, HideAndShow)
 {
     Element* panel = getElementByShadowPseudoId(mediaControls(), "-webkit-media-controls-panel");
     ASSERT_NE(nullptr, panel);
@@ skipping 20 matching lines @@
     Element* panel = getElementByShadowPseudoId(mediaControls(), "-webkit-media-controls-panel");
     ASSERT_NE(nullptr, panel);
 
     ASSERT_TRUE(isElementVisible(*panel));
     mediaControls().hide();
     ASSERT_FALSE(isElementVisible(*panel));
     mediaControls().reset();
     ASSERT_FALSE(isElementVisible(*panel));
 }
 
+TEST_F(MediaControlsTest, ResetDoesNotTriggerInitialLayout)
+{
+    Document& document = this->document();
+    int oldResolverCount = document.styleEngine().resolverAccessCount();
+    // Also assert that there are no layouts yet.
+    ASSERT_EQ(0, oldResolverCount);
+    mediaControls().reset();
+    int newResolverCount = document.styleEngine().resolverAccessCount();
+    ASSERT_EQ(oldResolverCount, newResolverCount);
+}
+
 } // namespace blink