Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Unified Diff: third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp

Issue 1611693002: Revert of Don't change layout size due to top control show/hide (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 9688ef22bf5ea4a1092243d156636be996f5a5aa..642508cb14e55c9ad3c6b410b8ff7fba5d0cbe8b 100644
--- a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -39,6 +39,7 @@
#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 {
@@ -200,8 +201,12 @@
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(m_document->layoutView());
+ CSSToLengthConversionData::ViewportSize viewportSize(width, height);
if (primitiveValue->getValueID() == CSSValueAuto)
return Length(Auto);
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp ('k') | third_party/WebKit/Source/core/frame/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698