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

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

 /*
  * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 21 matching lines @@
 #include "core/CSSValueKeywords.h"
 #include "core/css/CSSDefaultStyleSheets.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/resolver/ScopedStyleResolver.h"
 #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 {
 
 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ViewportStyleResolver);
 
 ViewportStyleResolver::ViewportStyleResolver(Document* document)
     : m_document(document)
     , m_hasAuthorStyle(false)
 {
@@ skipping 141 matching lines @@
 
     if (primitiveValue->getValueID() == CSSValueInternalExtendToZoom)
         return Length(ExtendToZoom);
 
     ComputedStyle* documentStyle = m_document->mutableComputedStyle();
 
     // If we have viewport units the conversion will mark the document style as having viewport units.
     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);
 
     Length result = primitiveValue->convertToLength(CSSToLengthConversionData(documentStyle, fontSizes, viewportSize, 1.0f));
     if (documentStyle->hasViewportUnits())
         m_document->setHasViewportUnits();
     documentStyle->setHasViewportUnits(documentStyleHasViewportUnits);
 
     return result;
 }
 
 DEFINE_TRACE(ViewportStyleResolver)
 {
     visitor->trace(m_propertySet);
     visitor->trace(m_document);
 }
 
 } // namespace blink