Use clampTo in DoublePoint::operator FloatPoint()

Remove some unused conversion helpers that would otherwise need similar
treatment. In the case of ToFloatSize(const DoubleSize&) it was used in
one instance but erroneously so, promoting to DoubleSize just so that it
could convert back to FloatSize/ScrollOffset again.

Bug: 983032
Change-Id: I416f24fc125b447c881edbdebf5d1796483bec85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1698507Reviewed-by: Stephen Chenney <schenney@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#676583}

third_party/blink/renderer/core/frame/root_frame_viewport.cc

@@ -164,8 +164,7 @@ int RootFrameViewport::VerticalScrollbarWidth(
 }
 
 void RootFrameViewport::UpdateScrollAnimator() {
-  GetScrollAnimator().SetCurrentOffset(
-      ToFloatSize(ScrollOffsetFromScrollAnimators()));
+  GetScrollAnimator().SetCurrentOffset(ScrollOffsetFromScrollAnimators());
 }
 
 ScrollOffset RootFrameViewport::ScrollOffsetFromScrollAnimators() const {

third_party/blink/renderer/platform/geometry/double_point.cc

@@ -5,12 +5,15 @@
 #include "third_party/blink/renderer/platform/geometry/double_point.h"
 
 #include <algorithm>
-#include "third_party/blink/renderer/platform/geometry/float_size.h"
-#include "third_party/blink/renderer/platform/geometry/layout_point.h"
+#include "third_party/blink/renderer/platform/wtf/math_extras.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
 namespace blink {
 
+DoublePoint::operator FloatPoint() const {
+  return FloatPoint(clampTo<float>(x_), clampTo<float>(y_));
+}
+
 DoublePoint DoublePoint::ExpandedTo(const DoublePoint& other) const {
   return DoublePoint(std::max(x_, other.x_), std::max(y_, other.y_));
 }

third_party/blink/renderer/platform/geometry/double_point.h

@@ -14,8 +14,6 @@
 
 namespace blink {
 
-class LayoutPoint;
-
 class PLATFORM_EXPORT DoublePoint {
   DISALLOW_NEW();
 
@@ -33,7 +31,7 @@ class PLATFORM_EXPORT DoublePoint {
   constexpr explicit DoublePoint(const DoubleSize& size)
       : x_(size.Width()), y_(size.Height()) {}
 
-  constexpr explicit operator FloatPoint() const { return FloatPoint(x_, y_); }
+  explicit operator FloatPoint() const;
 
   static constexpr DoublePoint Zero() { return DoublePoint(); }
 
@@ -123,10 +121,6 @@ inline IntPoint FlooredIntPoint(const DoublePoint& p) {
   return IntPoint(clampTo<int>(floor(p.X())), clampTo<int>(floor(p.Y())));
 }
 
-constexpr FloatPoint ToFloatPoint(const DoublePoint& a) {
-  return FloatPoint(a.X(), a.Y());
-}
-
 constexpr DoubleSize ToDoubleSize(const DoublePoint& a) {
   return DoubleSize(a.X(), a.Y());
 }

third_party/blink/renderer/platform/geometry/double_size.h

@@ -104,10 +104,6 @@ inline IntSize ExpandedIntSize(const DoubleSize& p) {
   return IntSize(clampTo<int>(ceil(p.Width())), clampTo<int>(ceil(p.Height())));
 }
 
-constexpr FloatSize ToFloatSize(const DoubleSize& p) {
-  return FloatSize(p.Width(), p.Height());
-}
-
 PLATFORM_EXPORT std::ostream& operator<<(std::ostream&, const DoubleSize&);
 
 }  // namespace blink