Reland of Don't change layout size due to top control show/hide

third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp

Index: third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
index 642508cb14e55c9ad3c6b410b8ff7fba5d0cbe8b..9688ef22bf5ea4a1092243d156636be996f5a5aa 100644
--- a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -39,7 +39,6 @@
 #include "core/dom/Document.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/ViewportDescription.h"
-#include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 
 namespace blink {
@@ -201,12 +200,8 @@
     bool documentStyleHasViewportUnits = documentStyle->hasViewportUnits();
     documentStyle->setHasViewportUnits(false);
 
-    FrameView* view = m_document->view();
-    float width = view ? view->width() : 0;
-    float height = view ? view->height() : 0;
-
     CSSToLengthConversionData::FontSizes fontSizes(documentStyle, documentStyle);
-    CSSToLengthConversionData::ViewportSize viewportSize(width, height);
+    CSSToLengthConversionData::ViewportSize viewportSize(m_document->layoutView());
 
     if (primitiveValue->getValueID() == CSSValueAuto)
         return Length(Auto);