Use float for scroll offset.

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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 "core/CoreExport.h"
 #include "core/events/Event.h"
-#include "platform/geometry/FloatPoint.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"
 #include <memory>
 
 namespace blink {
 class WebScrollbarLayer;
 class WebLayer;
@@ skipping 39 matching lines @@
   GraphicsLayer* overscrollElasticityLayer() {
     return m_overscrollElasticityLayer.get();
   }
 
   void initializeScrollbars();
 
   // Sets the location of the visual viewport relative to the outer viewport.
   // The coordinates are in partial CSS pixels.
   void setLocation(const FloatPoint&);
   // FIXME: This should be called moveBy
-  void move(const FloatPoint&);
-  void move(const FloatSize&);
-  FloatPoint location() const { return m_offset; }
+  void move(const ScrollOffset&);
 
   // Sets the size of the inner viewport when unscaled in CSS pixels.
   void setSize(const IntSize&);
   IntSize size() const { return m_size; }
 
   // Gets the scaled size, i.e. the viewport in root view space.
   FloatSize visibleSize() const;
 
   // Resets the viewport to initial state.
   void reset();
@@ skipping 12 matching lines @@
   // if page scale factor is left unchanged.
   bool magnifyScaleAroundAnchor(float magnifyDelta, const FloatPoint& anchor);
 
   void setScrollLayerOnScrollbars(WebLayer*) const;
 
   // The portion of the unzoomed frame visible in the visual viewport,
   // in partial CSS pixels. Relative to the main frame.
   FloatRect visibleRect() const;
 
   // The viewport rect relative to the document origin, in partial CSS pixels.
-  // FIXME: This should be a DoubleRect since scroll offsets are now doubles.
   FloatRect visibleRectInDocument() const;
 
   // Convert the given rect in the main FrameView's coordinates into a rect
   // in the viewport. The given and returned rects are in CSS pixels, meaning
   // scale isn't applied.
   FloatRect mainViewToViewportCSSPixels(const FloatRect&) const;
   FloatPoint viewportCSSPixelsToRootFrame(const FloatPoint&) const;
 
   // Clamp the given point, in document coordinates, to the maximum/minimum
   // scroll extents of the viewport within the document.
@@ skipping 17 matching lines @@
   FloatRect rootFrameToViewport(const FloatRect&) const;
   IntRect rootFrameToViewport(const IntRect&) const;
 
   FloatPoint viewportToRootFrame(const FloatPoint&) const;
   FloatPoint rootFrameToViewport(const FloatPoint&) const;
   IntPoint viewportToRootFrame(const IntPoint&) const;
   IntPoint rootFrameToViewport(const IntPoint&) const;
 
   // ScrollableArea implementation
   HostWindow* getHostWindow() const override;
-  DoubleRect visibleContentRectDouble(
-      IncludeScrollbarsInRect = ExcludeScrollbars) const override;
-  IntRect visibleContentRect(
-      IncludeScrollbarsInRect = ExcludeScrollbars) const override;
   bool shouldUseIntegerScrollOffset() const override;
-  void setScrollPosition(const DoublePoint&,
-                         ScrollType,
-                         ScrollBehavior = ScrollBehaviorInstant) override;
+  void setScrollOffset(const ScrollOffset&,
+                       ScrollType,
+                       ScrollBehavior = ScrollBehaviorInstant) override;
   LayoutRect visualRectForScrollbarParts() const override {
     ASSERT_NOT_REACHED();
     return LayoutRect();
   }
   bool isActive() const override { return false; }
   int scrollSize(ScrollbarOrientation) const override;
   bool isScrollCornerVisible() const override { return false; }
   IntRect scrollCornerRect() const override { return IntRect(); }
-  IntPoint scrollPosition() const override { return flooredIntPoint(m_offset); }
-  DoublePoint scrollPositionDouble() const override { return m_offset; }
-  IntPoint minimumScrollPosition() const override;
-  IntPoint maximumScrollPosition() const override;
-  DoublePoint maximumScrollPositionDouble() const override;
+  IntSize scrollOffsetInt() const override { return flooredIntSize(m_offset); }
+  ScrollOffset scrollOffset() const override { return m_offset; }
+  IntSize minimumScrollOffsetInt() const override;
+  IntSize maximumScrollOffsetInt() const override;
+  ScrollOffset maximumScrollOffset() const override;
   int visibleHeight() const override { return visibleRect().height(); }
   int visibleWidth() const override { return visibleRect().width(); }
   IntSize contentsSize() const override;
   bool scrollbarsCanBeActive() const override { return false; }
   IntRect scrollableAreaBoundingBox() const override;
   bool userInputScrollable(ScrollbarOrientation) const override { return true; }
   bool shouldPlaceVerticalScrollbarOnLeft() const override { return false; }
   bool scrollAnimatorEnabled() const override;
   void scrollControlWasSetNeedsPaintInvalidation() override {}
-  void setScrollOffset(const DoublePoint&, ScrollType) override;
+  void updateScrollOffset(const ScrollOffset&, ScrollType) override;
   GraphicsLayer* layerForContainer() const override;
   GraphicsLayer* layerForScrolling() const override;
   GraphicsLayer* layerForHorizontalScrollbar() const override;
   GraphicsLayer* layerForVerticalScrollbar() const override;
   Widget* getWidget() override;
   CompositorAnimationTimeline* compositorAnimationTimeline() const override;
 
   // Visual Viewport API implementation.
   double scrollLeft();
   double scrollTop();
@@ skipping 28 matching lines @@
     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);
-  FloatPoint clampOffsetToBoundaries(const FloatPoint&);
 
   void notifyRootFrameViewport() const;
 
   LocalFrame* mainFrame() const;
 
   FrameHost& frameHost() const {
     ASSERT(m_frameHost);
     return *m_frameHost;
   }
 
   Member<FrameHost> m_frameHost;
   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.
-  FloatPoint m_offset;
+  ScrollOffset m_offset;
   float m_scale;
   IntSize m_size;
   float m_topControlsAdjustment;
   float m_maxPageScale;
   bool m_trackPinchZoomStatsForPage;
 };
 
 }  // namespace blink
 
 #endif  // VisualViewport_h