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

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 31a29ae0c5c6582c085350615c01d1cee3193ccf..96623a4d55822ad032fa72aa7de2b73db385615d 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp
@@ -56,13 +56,14 @@ 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;
@@ -103,4 +104,15 @@ TEST_F(MediaControlsTest, HideAndReset)
     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