Removed FrameHost::settings()

third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 893 matching lines @@
 }
 
 bool LocalDOMWindow::offscreenBuffering() const {
   return true;
 }
 
 int LocalDOMWindow::outerHeight() const {
   if (!frame())
     return 0;
 
-  FrameHost* host = frame()->host();
-  if (!host)
+  Page* page = frame()->page();
+  if (!page)
     return 0;
 
-  ChromeClient& chromeClient = host->chromeClient();
-  if (host->settings().getReportScreenSizeInPhysicalPixelsQuirk())
+  ChromeClient& chromeClient = page->chromeClient();
+  if (page->settings().getReportScreenSizeInPhysicalPixelsQuirk())
     return lroundf(chromeClient.rootWindowRect().height() *
                    chromeClient.screenInfo().deviceScaleFactor);
   return chromeClient.rootWindowRect().height();
 }
 
 int LocalDOMWindow::outerWidth() const {
   if (!frame())
     return 0;
 
-  FrameHost* host = frame()->host();
-  if (!host)
+  Page* page = frame()->page();
+  if (!page)
     return 0;
 
-  ChromeClient& chromeClient = host->chromeClient();
-  if (host->settings().getReportScreenSizeInPhysicalPixelsQuirk())
+  ChromeClient& chromeClient = page->chromeClient();
+  if (page->settings().getReportScreenSizeInPhysicalPixelsQuirk())
     return lroundf(chromeClient.rootWindowRect().width() *
                    chromeClient.screenInfo().deviceScaleFactor);
 
   return chromeClient.rootWindowRect().width();
 }
 
 FloatSize LocalDOMWindow::getViewportSize(
     IncludeScrollbarsInRect scrollbarInclusion) const {
   if (!frame())
     return FloatSize();
 
   FrameView* view = frame()->view();
   if (!view)
     return FloatSize();
 
   FrameHost* host = frame()->host();

[haraken, 2017/02/24 04:37:18]

Can you remove this check since we're deprecating the FrameHost?

Page* page = frame()->page();
if (!page)
  return FloatSize();

[sashab, 2017/02/24 04:41:53]

I need this here because host->visualViewport is used below.

But sure, swapped the frame and page so the page is the one in the if-statement.

   if (!host)
     return FloatSize();
 
+  Page* page = frame()->page();
+  // If we have a FrameHost, we must have a Page.
+  DCHECK(page);
+
   // The main frame's viewport size depends on the page scale. Since the
   // initial page scale depends on the content width and is set after a
   // layout, perform one now so queries during page load will use the up to
   // date viewport.
-  if (host->settings().getViewportEnabled() && frame()->isMainFrame())
+  if (page->settings().getViewportEnabled() && frame()->isMainFrame())
     document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   // FIXME: This is potentially too much work. We really only need to know the
   // dimensions of the parent frame's layoutObject.
   if (Frame* parent = frame()->tree().parent()) {
     if (parent && parent->isLocalFrame())
       toLocalFrame(parent)
           ->document()
           ->updateStyleAndLayoutIgnorePendingStylesheets();
   }
 
-  return frame()->isMainFrame() && !host->settings().getInertVisualViewport()
+  return frame()->isMainFrame() && !page->settings().getInertVisualViewport()
              ? FloatSize(host->visualViewport().visibleRect().size())
              : FloatSize(view->visibleContentRect(scrollbarInclusion).size());
 }
 
 int LocalDOMWindow::innerHeight() const {
   if (!frame())
     return 0;
 
   FloatSize viewportSize = getViewportSize(IncludeScrollbars);
   return adjustForAbsoluteZoom(expandedIntSize(viewportSize).height(),
                                frame()->pageZoomFactor());
 }
 
 int LocalDOMWindow::innerWidth() const {
   if (!frame())
     return 0;
 
   FloatSize viewportSize = getViewportSize(IncludeScrollbars);
   return adjustForAbsoluteZoom(expandedIntSize(viewportSize).width(),
                                frame()->pageZoomFactor());
 }
 
 int LocalDOMWindow::screenX() const {
   if (!frame())
     return 0;
 
-  FrameHost* host = frame()->host();
-  if (!host)
+  Page* page = frame()->page();
+  if (!page)
     return 0;
 
-  ChromeClient& chromeClient = host->chromeClient();
-  if (host->settings().getReportScreenSizeInPhysicalPixelsQuirk())
+  ChromeClient& chromeClient = page->chromeClient();
+  if (page->settings().getReportScreenSizeInPhysicalPixelsQuirk())
     return lroundf(chromeClient.rootWindowRect().x() *
                    chromeClient.screenInfo().deviceScaleFactor);
   return chromeClient.rootWindowRect().x();
 }
 
 int LocalDOMWindow::screenY() const {
   if (!frame())
     return 0;
 
-  FrameHost* host = frame()->host();
-  if (!host)
+  Page* page = frame()->page();
+  if (!page)
     return 0;
 
-  ChromeClient& chromeClient = host->chromeClient();
-  if (host->settings().getReportScreenSizeInPhysicalPixelsQuirk())
+  ChromeClient& chromeClient = page->chromeClient();
+  if (page->settings().getReportScreenSizeInPhysicalPixelsQuirk())
     return lroundf(chromeClient.rootWindowRect().y() *
                    chromeClient.screenInfo().deviceScaleFactor);
   return chromeClient.rootWindowRect().y();
 }
 
 double LocalDOMWindow::scrollX() const {
-  if (!frame() || !frame()->host())
+  if (!frame() || !frame()->page())
     return 0;
 
-  if (!frame()->host()->settings().getInertVisualViewport())
+  if (!frame()->page()->settings().getInertVisualViewport())
     return m_visualViewport->pageX();
 
   FrameView* view = frame()->view();
   if (!view)
     return 0;
 
   document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   double viewportX =
       view->layoutViewportScrollableArea()->getScrollOffset().width();
   return adjustScrollForAbsoluteZoom(viewportX, frame()->pageZoomFactor());
 }
 
 double LocalDOMWindow::scrollY() const {
-  if (!frame() || !frame()->host())
+  if (!frame() || !frame()->page())
     return 0;
 
-  if (!frame()->host()->settings().getInertVisualViewport())
+  if (!frame()->page()->settings().getInertVisualViewport())
     return m_visualViewport->pageY();
 
   FrameView* view = frame()->view();
   if (!view)
     return 0;
 
   document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   double viewportY =
       view->layoutViewportScrollableArea()->getScrollOffset().height();
@@ skipping 104 matching lines @@
                               ScrollBehavior scrollBehavior) const {
   if (!isCurrentlyDisplayedInFrame())
     return;
 
   document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   FrameView* view = frame()->view();
   if (!view)
     return;
 
-  FrameHost* host = frame()->host();
-  if (!host)
+  Page* page = frame()->page();
+  if (!page)
     return;
 
   x = ScrollableArea::normalizeNonFiniteScroll(x);
   y = ScrollableArea::normalizeNonFiniteScroll(y);
 
-  ScrollableArea* viewport = host->settings().getInertVisualViewport()
+  ScrollableArea* viewport = page->settings().getInertVisualViewport()
                                  ? view->layoutViewportScrollableArea()
                                  : view->getScrollableArea();
 
   ScrollOffset currentOffset = viewport->getScrollOffset();
   ScrollOffset scaledDelta(x * frame()->pageZoomFactor(),
                            y * frame()->pageZoomFactor());
 
   viewport->setScrollOffset(currentOffset + scaledDelta, ProgrammaticScroll,
                             scrollBehavior);
 }
@@ skipping 12 matching lines @@
 }
 
 void LocalDOMWindow::scrollTo(double x, double y) const {
   if (!isCurrentlyDisplayedInFrame())
     return;
 
   FrameView* view = frame()->view();
   if (!view)
     return;
 
-  FrameHost* host = frame()->host();
-  if (!host)
+  Page* page = frame()->page();
+  if (!page)
     return;
 
   x = ScrollableArea::normalizeNonFiniteScroll(x);
   y = ScrollableArea::normalizeNonFiniteScroll(y);
 
   // It is only necessary to have an up-to-date layout if the position may be
   // clamped, which is never the case for (0, 0).
   if (x || y)
     document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   ScrollOffset layoutOffset(x * frame()->pageZoomFactor(),
                             y * frame()->pageZoomFactor());
-  ScrollableArea* viewport = host->settings().getInertVisualViewport()
+  ScrollableArea* viewport = page->settings().getInertVisualViewport()
                                  ? view->layoutViewportScrollableArea()
                                  : view->getScrollableArea();
   viewport->setScrollOffset(layoutOffset, ProgrammaticScroll,
                             ScrollBehaviorAuto);
 }
 
 void LocalDOMWindow::scrollTo(const ScrollToOptions& scrollToOptions) const {
   if (!isCurrentlyDisplayedInFrame())
     return;
 
   FrameView* view = frame()->view();
   if (!view)
     return;
 
-  FrameHost* host = frame()->host();
-  if (!host)
+  Page* page = frame()->page();
+  if (!page)
     return;
 
   // It is only necessary to have an up-to-date layout if the position may be
   // clamped, which is never the case for (0, 0).
   if (!scrollToOptions.hasLeft() || !scrollToOptions.hasTop() ||
       scrollToOptions.left() || scrollToOptions.top()) {
     document()->updateStyleAndLayoutIgnorePendingStylesheets();
   }
 
   double scaledX = 0.0;
   double scaledY = 0.0;
 
-  ScrollableArea* viewport = host->settings().getInertVisualViewport()
+  ScrollableArea* viewport = page->settings().getInertVisualViewport()
                                  ? view->layoutViewportScrollableArea()
                                  : view->getScrollableArea();
 
   ScrollOffset currentOffset = viewport->getScrollOffset();
   scaledX = currentOffset.width();
   scaledY = currentOffset.height();
 
   if (scrollToOptions.hasLeft())
     scaledX = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.left()) *
               frame()->pageZoomFactor();
@@ skipping 367 matching lines @@
   DOMWindow::trace(visitor);
   Supplementable<LocalDOMWindow>::trace(visitor);
 }
 
 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) {
   visitor->traceWrappers(m_customElements);
   DOMWindow::traceWrappers(visitor);
 }
 
 }  // namespace blink