Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 818 matching lines @@
         break;
       }
 
       // Don't trigger a disambiguation popup on sites designed for mobile
       // devices.  Instead, assume that the page has been designed with big
       // enough buttons and links.  Don't trigger a disambiguation popup when
       // screencasting, since it's implemented outside of compositor pipeline
       // and is not being screencasted itself. This leads to bad user
       // experience.
       WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl();
-      VisualViewport& visualViewport = page()->frameHost().visualViewport();
+      VisualViewport& visualViewport = page()->visualViewport();
       bool screencastEnabled = devTools && devTools->screencastEnabled();
       if (event.data.tap.width > 0 &&
           !visualViewport.shouldDisableDesktopWorkarounds() &&
           !screencastEnabled) {
         IntRect boundingBox(visualViewport.viewportToRootFrame(
             IntRect(event.x - event.data.tap.width / 2,
                     event.y - event.data.tap.height / 2, event.data.tap.width,
                     event.data.tap.height)));
 
         // TODO(bokan): We shouldn't pass details of the VisualViewport offset
@@ skipping 151 matching lines @@
       m_layerTreeView->didStopFlinging();
     return true;
   }
   return false;
 }
 
 bool WebViewImpl::startPageScaleAnimation(const IntPoint& targetPosition,
                                           bool useAnchor,
                                           float newScale,
                                           double durationInSeconds) {
-  VisualViewport& visualViewport = page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = page()->visualViewport();
   WebPoint clampedPoint = targetPosition;
   if (!useAnchor) {
     clampedPoint =
         visualViewport.clampDocumentOffsetAtScale(targetPosition, newScale);
     if (!durationInSeconds) {
       setPageScaleFactor(newScale);
 
       FrameView* view = mainFrameImpl()->frameView();
       if (view && view->getScrollableArea()) {
         view->getScrollableArea()->setScrollOffset(
@@ skipping 366 matching lines @@
   if (rect.width < screenWidth)
     rect.x -= 0.5 * (screenWidth - rect.width);
   else
     rect.x =
         std::max<float>(rect.x, hitPointInRootFrame.x + padding - screenWidth);
   scroll.x = rect.x;
   scroll.y = rect.y;
 
   scale = clampPageScaleFactorToLimits(scale);
   scroll = mainFrameImpl()->frameView()->rootFrameToContents(scroll);
-  scroll = page()->frameHost().visualViewport().clampDocumentOffsetAtScale(
-      scroll, scale);
+  scroll = page()->visualViewport().clampDocumentOffsetAtScale(scroll, scale);
 }
 
 static Node* findCursorDefiningAncestor(Node* node, LocalFrame* frame) {
   // Go up the tree to find the node that defines a mouse cursor style
   while (node) {
     if (node->layoutObject()) {
       ECursor cursor = node->layoutObject()->style()->cursor();
       if (cursor != ECursor::kAuto ||
           frame->eventHandler().useHandCursor(node, node->isLink()))
         break;
@@ skipping 356 matching lines @@
   m_client = nullptr;
 
   deref();  // Balances ref() acquired in WebView::create
 }
 
 WebSize WebViewImpl::size() {
   return m_size;
 }
 
 void WebViewImpl::resizeVisualViewport(const WebSize& newSize) {
-  page()->frameHost().visualViewport().setSize(newSize);
-  page()->frameHost().visualViewport().clampToBoundaries();
+  page()->visualViewport().setSize(newSize);
+  page()->visualViewport().clampToBoundaries();
 }
 
 void WebViewImpl::performResize() {
   // We'll keep the initial containing block size from changing when the top
   // controls hide so that the ICB will always be the same size as the
   // viewport with the browser controls shown.
   IntSize ICBSize = m_size;
   if (RuntimeEnabledFeatures::inertTopControlsEnabled() &&
       browserControls().permittedState() == WebBrowserControlsBoth &&
       !browserControls().shrinkViewport())
     ICBSize.expand(0, -browserControls().height());
 
   pageScaleConstraintsSet().didChangeInitialContainingBlockSize(ICBSize);
 
   updatePageDefinedViewportConstraints(
       mainFrameImpl()->frame()->document()->viewportDescription());
   updateMainFrameLayoutSize();
 
-  page()->frameHost().visualViewport().setSize(m_size);
+  page()->visualViewport().setSize(m_size);
 
   if (mainFrameImpl()->frameView()) {
     mainFrameImpl()->frameView()->setInitialViewportSize(ICBSize);
     if (!mainFrameImpl()->frameView()->needsLayout())
       postLayoutResize(mainFrameImpl());
   }
 }
 
 void WebViewImpl::updateBrowserControlsState(WebBrowserControlsState constraint,
                                              WebBrowserControlsState current,
@@ skipping 27 matching lines @@
   }
 
   WebLocalFrameImpl* mainFrame = mainFrameImpl();
   if (!mainFrame)
     return;
 
   FrameView* view = mainFrame->frameView();
   if (!view)
     return;
 
-  VisualViewport& visualViewport = page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = page()->visualViewport();
 
   {
     // This object will save the current visual viewport offset w.r.t. the
     // document and restore it when the object goes out of scope. It's
     // needed since the browser controls adjustment will change the maximum
     // scroll offset and we may need to reposition them to keep the user's
     // apparent position unchanged.
     ResizeViewportAnchor::ResizeScope resizeScope(*m_resizeViewportAnchor);
 
     float browserControlsViewportAdjustment =
@@ skipping 40 matching lines @@
       browserControls().shrinkViewport() == browserControlsShrinkLayout)
     return;
 
   if (page()->mainFrame() && !page()->mainFrame()->isLocalFrame()) {
     // Viewport resize for a remote main frame does not require any
     // particular action, but the state needs to reflect the correct size
     // so that it can be used for initalization if the main frame gets
     // swapped to a LocalFrame at a later time.
     m_size = newSize;
     pageScaleConstraintsSet().didChangeInitialContainingBlockSize(m_size);
-    page()->frameHost().visualViewport().setSize(m_size);
+    page()->visualViewport().setSize(m_size);
     return;
   }
 
   WebLocalFrameImpl* mainFrame = mainFrameImpl();
   if (!mainFrame)
     return;
 
   FrameView* view = mainFrame->frameView();
   if (!view)
     return;
 
-  VisualViewport& visualViewport = page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = page()->visualViewport();
 
   bool isRotation =
       page()->settings().getMainFrameResizesAreOrientationChanges() &&
       m_size.width && contentsSize().width() && newSize.width != m_size.width &&
       !m_fullscreenController->isFullscreen();
   m_size = newSize;
 
   FloatSize viewportAnchorCoords(viewportAnchorCoordX, viewportAnchorCoordY);
   if (isRotation) {
     RotationViewportAnchor anchor(*view, visualViewport, viewportAnchorCoords,
@@ skipping 205 matching lines @@
   // on the page. There is a single input event, GestureTap, which can both
   // be the first event after page load, and cause a form submission. In that
   // case, the form submission happens before the autofill client is told
   // to unblock the password values, and so the password values are not
   // submitted. To avoid that, GestureTap is handled explicitly:
   if (inputEvent.type() == WebInputEvent::GestureTap && autofillClient) {
     m_userGestureObserved = true;
     autofillClient->firstUserGestureObserved();
   }
 
-  page()->frameHost().visualViewport().startTrackingPinchStats();
+  page()->visualViewport().startTrackingPinchStats();
 
   TRACE_EVENT1("input,rail", "WebViewImpl::handleInputEvent", "type",
                WebInputEvent::GetName(inputEvent.type()));
 
   // If a drag-and-drop operation is in progress, ignore input events.
   if (mainFrameImpl()->frameWidget()->doingDragAndDrop())
     return WebInputEventResult::HandledSuppressed;
 
   if (m_devToolsEmulator->handleInputEvent(inputEvent))
     return WebInputEventResult::HandledSuppressed;
@@ skipping 83 matching lines @@
     // as touch events would have already been sent for the gesture.
     if (pinchEvent.sourceDevice == WebGestureDeviceTouchpad) {
       result = handleSyntheticWheelFromTouchpadPinchEvent(pinchEvent);
       if (result != WebInputEventResult::NotHandled)
         return result;
     }
 
     if (pinchEvent.data.pinchUpdate.zoomDisabled)
       return WebInputEventResult::NotHandled;
 
-    if (page()->frameHost().visualViewport().magnifyScaleAroundAnchor(
+    if (page()->visualViewport().magnifyScaleAroundAnchor(
             pinchEvent.data.pinchUpdate.scale,
             FloatPoint(pinchEvent.x, pinchEvent.y)))
       return WebInputEventResult::HandledSystem;
   }
 
   return WebInputEventResult::NotHandled;
 }
 
 void WebViewImpl::setCursorVisibilityState(bool isVisible) {
   if (m_page)
@@ skipping 468 matching lines @@
   if (!frame || !frame->view() || !element)
     return false;
 
   if (!isElementEditable(element))
     return false;
 
   element->document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   bool zoomInToLegibleScale =
       m_webSettings->autoZoomFocusedNodeToLegibleScale() &&
-      !page()->frameHost().visualViewport().shouldDisableDesktopWorkarounds();
+      !page()->visualViewport().shouldDisableDesktopWorkarounds();
 
   if (zoomInToLegibleScale) {
     // When deciding whether to zoom in on a focused text box, we should decide
     // not to zoom in if the user won't be able to zoom out. e.g if the textbox
     // is within a touch-action: none container the user can't zoom back out.
     TouchAction action = TouchActionUtil::computeEffectiveTouchAction(*element);
     if (!(action & TouchActionPinchZoom))
       zoomInToLegibleScale = false;
   }
 
@@ skipping 13 matching lines @@
   IntPoint targetPosition(targetX, targetY);
   startPageScaleAnimation(targetPosition, false, pageScaleFactor(),
                           (double)durationMs / 1000);
 }
 
 void WebViewImpl::computeScaleAndScrollForFocusedNode(Node* focusedNode,
                                                       bool zoomInToLegibleScale,
                                                       float& newScale,
                                                       IntPoint& newScroll,
                                                       bool& needAnimation) {
-  VisualViewport& visualViewport = page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = page()->visualViewport();
 
   WebRect caretInViewport, unusedEnd;
   selectionBounds(caretInViewport, unusedEnd);
 
   // 'caretInDocument' is rect encompassing the blinking cursor relative to the
   // root document.
   IntRect caretInDocument = mainFrameImpl()->frameView()->frameToContents(
       visualViewport.viewportToRootFrame(caretInViewport));
   IntRect textboxRectInDocument = mainFrameImpl()->frameView()->frameToContents(
       focusedNode->document().view()->contentsToRootFrame(
@@ skipping 162 matching lines @@
 
 double WebView::zoomFactorToZoomLevel(double factor) {
   // Since factor = 1.2^level, level = log(factor) / log(1.2)
   return log(factor) / log(textSizeMultiplierRatio);
 }
 
 float WebViewImpl::pageScaleFactor() const {
   if (!page())
     return 1;
 
-  return page()->frameHost().visualViewport().scale();
+  return page()->visualViewport().scale();
 }
 
 float WebViewImpl::clampPageScaleFactorToLimits(float scaleFactor) const {
   return pageScaleConstraintsSet().finalConstraints().clampToConstraints(
       scaleFactor);
 }
 
 void WebViewImpl::setVisualViewportOffset(const WebFloatPoint& offset) {
   DCHECK(page());
-  page()->frameHost().visualViewport().setLocation(offset);
+  page()->visualViewport().setLocation(offset);
 }
 
 WebFloatPoint WebViewImpl::visualViewportOffset() const {
   DCHECK(page());
-  return page()->frameHost().visualViewport().visibleRect().location();
+  return page()->visualViewport().visibleRect().location();
 }
 
 WebFloatSize WebViewImpl::visualViewportSize() const {
   DCHECK(page());
-  return page()->frameHost().visualViewport().visibleRect().size();
+  return page()->visualViewport().visibleRect().size();
 }
 
 void WebViewImpl::scrollAndRescaleViewports(
     float scaleFactor,
     const IntPoint& mainFrameOrigin,
     const FloatPoint& visualViewportOrigin) {
   if (!page())
     return;
 
   if (!mainFrameImpl())
     return;
 
   FrameView* view = mainFrameImpl()->frameView();
   if (!view)
     return;
 
   // Order is important: visual viewport location is clamped based on
   // main frame scroll position and visual viewport scale.
 
   view->setScrollOffset(toScrollOffset(mainFrameOrigin), ProgrammaticScroll);
 
   setPageScaleFactor(scaleFactor);
 
-  page()->frameHost().visualViewport().setLocation(visualViewportOrigin);
+  page()->visualViewport().setLocation(visualViewportOrigin);
 }
 
 void WebViewImpl::setPageScaleFactorAndLocation(float scaleFactor,
                                                 const FloatPoint& location) {
   DCHECK(page());
 
-  page()->frameHost().visualViewport().setScaleAndLocation(
+  page()->visualViewport().setScaleAndLocation(
       clampPageScaleFactorToLimits(scaleFactor), location);
 }
 
 void WebViewImpl::setPageScaleFactor(float scaleFactor) {
   DCHECK(page());
 
   scaleFactor = clampPageScaleFactorToLimits(scaleFactor);
   if (scaleFactor == pageScaleFactor())
     return;
 
-  page()->frameHost().visualViewport().setScale(scaleFactor);
+  page()->visualViewport().setScale(scaleFactor);
 }
 
 void WebViewImpl::setDeviceScaleFactor(float scaleFactor) {
   if (!page())
     return;
 
   page()->setDeviceScaleFactorDeprecated(scaleFactor);
 
   if (m_layerTreeView)
     updateLayerTreeDeviceScaleFactor();
@@ skipping 259 matching lines @@
 
 float WebViewImpl::maximumPageScaleFactor() const {
   return pageScaleConstraintsSet().finalConstraints().maximumScale;
 }
 
 void WebViewImpl::resetScaleStateImmediately() {
   pageScaleConstraintsSet().setNeedsReset(true);
 }
 
 void WebViewImpl::resetScrollAndScaleState() {
-  page()->frameHost().visualViewport().reset();
+  page()->visualViewport().reset();
 
   if (!page()->mainFrame()->isLocalFrame())
     return;
 
   if (FrameView* frameView = toLocalFrame(page()->mainFrame())->view()) {
     ScrollableArea* scrollableArea = frameView->layoutViewportScrollableArea();
 
     if (!scrollableArea->getScrollOffset().isZero())
       scrollableArea->setScrollOffset(ScrollOffset(), ProgrammaticScroll);
   }
@@ skipping 330 matching lines @@
     m_shouldDispatchFirstLayoutAfterFinishedParsing = true;
     m_shouldDispatchFirstLayoutAfterFinishedLoading = true;
 
     if (isNewNavigation) {
       pageScaleConstraintsSet().setNeedsReset(true);
       m_pageImportanceSignals.onCommitLoad();
     }
   }
 
   // Give the visual viewport's scroll layer its initial size.
-  page()->frameHost().visualViewport().mainFrameDidChangeSize();
+  page()->visualViewport().mainFrameDidChangeSize();
 
   // Make sure link highlight from previous page is cleared.
   m_linkHighlights.clear();
   endActiveFlingAnimation();
   m_userGestureObserved = false;
 }
 
 void WebViewImpl::postLayoutResize(WebLocalFrameImpl* webframe) {
   FrameView* view = webframe->frame()->view();
   if (webframe == mainFrame())
     m_resizeViewportAnchor->resizeFrameView(mainFrameSize());
   else
     view->resize(webframe->frameView()->size());
 }
 
 void WebViewImpl::layoutUpdated(WebLocalFrameImpl* webframe) {
   LocalFrame* frame = webframe->frame();
   if (!m_client || !frame->isMainFrame())
     return;
 
   if (m_shouldAutoResize) {
     WebSize frameSize = frame->view()->frameRect().size();
     if (frameSize != m_size) {
       m_size = frameSize;
 
-      page()->frameHost().visualViewport().setSize(m_size);
+      page()->visualViewport().setSize(m_size);
       pageScaleConstraintsSet().didChangeInitialContainingBlockSize(m_size);
       frame->view()->setInitialViewportSize(m_size);
 
       m_client->didAutoResize(m_size);
       sendResizeEventAndRepaint();
     }
   }
 
   if (pageScaleConstraintsSet().constraintsDirty())
     refreshPageScaleFactorAfterLayout();
@@ skipping 73 matching lines @@
   Document* document = frame->document();
   if (!document)
     return nullptr;
 
   return document->focusedElement();
 }
 
 HitTestResult WebViewImpl::hitTestResultForViewportPos(
     const IntPoint& posInViewport) {
   IntPoint rootFramePoint(
-      m_page->frameHost().visualViewport().viewportToRootFrame(posInViewport));
+      m_page->visualViewport().viewportToRootFrame(posInViewport));
   return hitTestResultForRootFramePos(rootFramePoint);
 }
 
 HitTestResult WebViewImpl::hitTestResultForRootFramePos(
     const IntPoint& posInRootFrame) {
   if (!m_page->mainFrame()->isLocalFrame())
     return HitTestResult();
   IntPoint docPoint(
       m_page->deprecatedLocalMainFrame()->view()->rootFrameToContents(
           posInRootFrame));
@@ skipping 53 matching lines @@
 
   DCHECK(document);
 
   // Get the outer viewport scroll layer.
   GraphicsLayer* layoutViewportScrollLayer =
       page()->frameHost().globalRootScrollerController().rootScrollerLayer();
   WebLayer* layoutViewportWebLayer =
       layoutViewportScrollLayer ? layoutViewportScrollLayer->platformLayer()
                                 : nullptr;
 
-  VisualViewport& visualViewport = page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = page()->visualViewport();
 
   // TODO(bokan): This was moved here from when registerViewportLayers was a
   // part of VisualViewport and maybe doesn't belong here. See comment inside
   // the mehtod.
   visualViewport.setScrollLayerOnScrollbars(layoutViewportWebLayer);
 
   m_layerTreeView->registerViewportLayers(
       visualViewport.overscrollElasticityLayer()->platformLayer(),
       visualViewport.pageScaleLayer()->platformLayer(),
       visualViewport.scrollLayer()->platformLayer(), layoutViewportWebLayer);
 }
 
 void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* graphicsLayer) {
   if (!m_layerTreeView)
     return;
 
   // In SPv2, setRootLayer is used instead.
   DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
-  VisualViewport& visualViewport = page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = page()->visualViewport();
   visualViewport.attachLayerTree(graphicsLayer);
   if (graphicsLayer) {
     m_rootGraphicsLayer = visualViewport.rootGraphicsLayer();
     m_visualViewportContainerLayer = visualViewport.containerLayer();
     m_rootLayer = m_rootGraphicsLayer->platformLayer();
     updateDeviceEmulationTransform();
     m_layerTreeView->setRootLayer(*m_rootLayer);
     // We register viewport layers here since there may not be a layer
     // tree view prior to this point.
     registerViewportLayersWithCompositor();
@@ skipping 114 matching lines @@
 }
 
 void WebViewImpl::applyViewportDeltas(
     const WebFloatSize& visualViewportDelta,
     // TODO(bokan): This parameter is to be removed but requires adjusting many
     // callsites.
     const WebFloatSize&,
     const WebFloatSize& elasticOverscrollDelta,
     float pageScaleDelta,
     float browserControlsShownRatioDelta) {
-  VisualViewport& visualViewport = page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = page()->visualViewport();
 
   // Store the desired offsets the visual viewport before setting the top
   // controls ratio since doing so will change the bounds and move the
   // viewports to keep the offsets valid. The compositor may have already
   // done that so we don't want to double apply the deltas here.
   FloatPoint visualViewportOffset = visualViewport.visibleRect().location();
   visualViewportOffset.move(visualViewportDelta.width,
                             visualViewportDelta.height);
 
   browserControls().setShownRatio(browserControls().shownRatio() +
@@ skipping 174 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink