Revert "Use expected main frame size from WebViewImpl when creating a new FrameView."

This reverts commit d43def09a965260b603064b5e6916c534b74b17c, aka r185145.

Speculative revert to fix content_browsertest failures on chromeos_rel
bot.

TBR=bokan
BUG=

Review URL: https://codereview.chromium.org/717053002

git-svn-id: svn://svn.chromium.org/blink/trunk@185176 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

@@ -1666,7 +1666,7 @@ void WebLocalFrameImpl::createFrameView()
     if (isLocalRoot)
         webView->suppressInvalidations(true);
 
-    frame()->createView(webView->mainFrameSize(), webView->baseBackgroundColor(), webView->isTransparent());
+    frame()->createView(webView->size(), webView->baseBackgroundColor(), webView->isTransparent());
     if (webView->shouldAutoResize() && isLocalRoot)
         frame()->view()->enableAutoSizeMode(webView->minAutoSize(), webView->maxAutoSize());
 

third_party/WebKit/Source/web/WebViewImpl.cpp

@@ -3210,21 +3210,6 @@ void WebViewImpl::setIgnoreViewportTagScaleLimits(bool ignore)
     setUserAgentPageScaleConstraints(constraints);
 }
 
-IntSize WebViewImpl::mainFrameSize() const
-{
-    if (!pinchVirtualViewportEnabled())
-        return m_size;
-
-    FrameView* view = page()->deprecatedLocalMainFrame()->view();
-
-    int contentAndScrollbarWidth = contentsSize().width();
-
-    if (view && view->verticalScrollbar() && !view->verticalScrollbar()->isOverlayScrollbar())
-        contentAndScrollbarWidth += view->verticalScrollbar()->width();
-
-    return m_pageScaleConstraintsSet.mainFrameSize(contentAndScrollbarWidth);
-}
-
 void WebViewImpl::refreshPageScaleFactorAfterLayout()
 {
     if (!mainFrame() || !page() || !page()->mainFrame() || !page()->mainFrame()->isLocalFrame() || !page()->deprecatedLocalMainFrame()->view())
@@ -3241,8 +3226,13 @@ void WebViewImpl::refreshPageScaleFactorAfterLayout()
         m_pageScaleConstraintsSet.adjustFinalConstraintsToContentsSize(contentsSize(), verticalScrollbarWidth);
     }
 
-    if (pinchVirtualViewportEnabled())
-        view->resize(mainFrameSize());
+    if (pinchVirtualViewportEnabled()) {
+        int contentAndScrollbarWidth = contentsSize().width();
+        if (view->verticalScrollbar() && !view->verticalScrollbar()->isOverlayScrollbar())
+            contentAndScrollbarWidth += view->verticalScrollbar()->width();
+
+        view->resize(m_pageScaleConstraintsSet.mainFrameSize(contentAndScrollbarWidth));
+    }
 
     float newPageScaleFactor = pageScaleFactor();
     if (m_pageScaleConstraintsSet.needsReset() && m_pageScaleConstraintsSet.finalConstraints().initialScale != -1) {

third_party/WebKit/Source/web/WebViewImpl.h

@@ -508,8 +508,6 @@ public:
 
     virtual void setTopControlsLayoutHeight(float) override;
 
-    IntSize mainFrameSize() const;
-
 private:
     void didUpdateTopControls();
     void setTopControlsContentOffset(float);

third_party/WebKit/Source/web/tests/PinchViewportTest.cpp

@@ -1209,23 +1209,5 @@ TEST_F(PinchViewportTest, TestTopControlHidingResizeDoesntClampMainFrame)
     EXPECT_EQ(500, frameView.scrollPositionDouble().y());
 }
 
-// Tests that when a new frame is created, it is created with the intended
-// size (i.e. the contentWidth).
-TEST_F(PinchViewportTest, TestMainFrameInitializationSizing)
-{
-    initializeWithAndroidSettings();
-
-    webViewImpl()->setPageScaleFactorLimits(0.5, 2.0);
-    webViewImpl()->resize(IntSize(100, 200));
-
-    registerMockedHttpURLLoad("content-width-1000.html");
-    navigateTo(m_baseURL + "content-width-1000.html");
-
-    WebLocalFrameImpl* localFrame = webViewImpl()->mainFrameImpl();
-    FrameView& frameView = *localFrame->frameView();
-    localFrame->createFrameView();
-
-    EXPECT_SIZE_EQ(IntSize(200, 400), frameView.frameRect().size());
-}
 
 } // namespace