Change VisualViewport to store a Page instead of a FrameHost

third_party/WebKit/Source/core/frame/VisualViewport.h

 /*
  * Copyright (C) 2013 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef VisualViewport_h
 #define VisualViewport_h
 
 #include <memory>
 #include "core/CoreExport.h"
 #include "core/events/Event.h"
-#include "core/frame/FrameHost.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "public/platform/WebScrollbar.h"
 #include "public/platform/WebSize.h"
 
 namespace blink {
 class WebScrollbarLayer;
@@ skipping 34 matching lines @@
 //     +- PLC::m_layerForVerticalScrollbar
 //     +- PLC::m_layerForScrollCorner (non-overlay only)
 //
 class CORE_EXPORT VisualViewport final
     : public GarbageCollectedFinalized<VisualViewport>,
       public GraphicsLayerClient,
       public ScrollableArea {
   USING_GARBAGE_COLLECTED_MIXIN(VisualViewport);
 
  public:
-  static VisualViewport* create(FrameHost& host) {
-    return new VisualViewport(host);
-  }
+  static VisualViewport* create(Page& host) { return new VisualViewport(host); }
   ~VisualViewport() override;
 
   DECLARE_VIRTUAL_TRACE();
 
   void createLayerTree();
   void attachLayerTree(GraphicsLayer*);
 
   GraphicsLayer* rootGraphicsLayer() { return m_rootTransformLayer.get(); }
   GraphicsLayer* containerLayer() {
     return m_innerViewportContainerLayer.get();
@@ skipping 124 matching lines @@
   // Used for gathering data on user pinch-zoom statistics.
   void userDidChangeScale();
   void sendUMAMetrics();
   void startTrackingPinchStats();
 
   // Heuristic-based function for determining if we should disable workarounds
   // for viewing websites that are not optimized for mobile devices.
   bool shouldDisableDesktopWorkarounds() const;
 
  private:
-  explicit VisualViewport(FrameHost&);
+  explicit VisualViewport(Page&);
 
   bool didSetScaleOrLocation(float scale, const FloatPoint& location);
 
   bool visualViewportSuppliesScrollbars() const;
 
   void updateStyleAndLayoutIgnorePendingStylesheets();
 
   void enqueueScrollEvent();
   void enqueueResizeEvent();
 
   // GraphicsLayerClient implementation.
   bool needsRepaint(const GraphicsLayer&) const {
     ASSERT_NOT_REACHED();
     return true;
   }
   IntRect computeInterestRect(const GraphicsLayer*, const IntRect&) const;
   void paintContents(const GraphicsLayer*,
                      GraphicsContext&,
                      GraphicsLayerPaintingPhase,
                      const IntRect&) const override;
   String debugName(const GraphicsLayer*) const override;
 
   void setupScrollbar(WebScrollbar::Orientation);
 
   void notifyRootFrameViewport() const;
 
   LocalFrame* mainFrame() const;
 
   Page& page() const {
-    DCHECK(m_frameHost);
-    return m_frameHost->page();
+    DCHECK(m_page);
+    return *m_page;
   }
 
-  Member<FrameHost> m_frameHost;
+  Member<Page> m_page;
   std::unique_ptr<GraphicsLayer> m_rootTransformLayer;
   std::unique_ptr<GraphicsLayer> m_innerViewportContainerLayer;
   std::unique_ptr<GraphicsLayer> m_overscrollElasticityLayer;
   std::unique_ptr<GraphicsLayer> m_pageScaleLayer;
   std::unique_ptr<GraphicsLayer> m_innerViewportScrollLayer;
   std::unique_ptr<GraphicsLayer> m_overlayScrollbarHorizontal;
   std::unique_ptr<GraphicsLayer> m_overlayScrollbarVertical;
   std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal;
   std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarVertical;
 
   // Offset of the visual viewport from the main frame's origin, in CSS pixels.
   ScrollOffset m_offset;
   float m_scale;
   IntSize m_size;
   float m_browserControlsAdjustment;
   float m_maxPageScale;
   bool m_trackPinchZoomStatsForPage;
 };
 
 }  // namespace blink
 
 #endif  // VisualViewport_h