Index: third_party/WebKit/Source/core/frame/FrameView.cpp |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp |
index c1b784b0ff6f7f564c92fabb2520dc3925eb4ac2..5d68ff08ec5d03d29a1993c9a870a18a7d54d514 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -40,9 +40,7 @@ |
#include "core/fetch/ResourceFetcher.h" |
#include "core/frame/FrameHost.h" |
#include "core/frame/LocalFrame.h" |
-#include "core/frame/PageScaleConstraintsSet.h" |
#include "core/frame/Settings.h" |
-#include "core/frame/TopControls.h" |
#include "core/html/HTMLFrameElement.h" |
#include "core/html/HTMLPlugInElement.h" |
#include "core/html/HTMLTextFormControlElement.h" |
@@ -1112,29 +1110,6 @@ |
return us; |
} |
-FloatSize FrameView::viewportSizeForViewportUnits() const |
-{ |
- FloatSize size(layoutSize(IncludeScrollbars)); |
- |
- // We use the layoutSize rather than frameRect to calculate viewport units |
- // so that we get correct results on mobile where the page is laid out into |
- // a rect that may be larger than the viewport (e.g. the 980px fallback |
- // width for desktop pages). Since the layout height is statically set to |
- // be the viewport with top controls showing, we add the top controls |
- // height, compensating for page scale as well, since we want to use the |
- // viewport with top controls hidden for vh (to match Safari). |
- TopControls& topControls = m_frame->host()->topControls(); |
- if (m_frame->isMainFrame() && size.width()) { |
- float pageScaleAtLayoutWidth = |
- m_frame->host()->visualViewport().size().width() / size.width(); |
- size.expand(0, topControls.height() / pageScaleAtLayoutWidth); |
- } |
- |
- float scale = frame().pageZoomFactor(); |
- size.scale(1 / scale); |
- return size; |
-} |
- |
DocumentLifecycle& FrameView::lifecycle() const |
{ |
return m_frame->document()->lifecycle(); |