Snapshot of all changes to get jumbo in blink and content.

third_party/WebKit/Source/platform/geometry/FloatPoint.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2005 Nokia.  All rights reserved.
  *
  * 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 19 matching lines @@
 #include <limits>
 #include "SkPoint.h"
 #include "platform/geometry/DoublePoint.h"
 #include "platform/geometry/LayoutPoint.h"
 #include "platform/geometry/LayoutSize.h"
 #include "platform/wtf/MathExtras.h"
 #include "platform/wtf/text/WTFString.h"
 
 namespace blink {
 
+  // Already exists in platform/graphics/skia/SkiaUtils so renamed here to not collide.
 // Skia has problems when passed infinite, etc floats, filter them to 0.
-static inline SkScalar WebCoreFloatToSkScalar(float f) {
+static inline SkScalar WebCoreFloatToSkScalar2(float f) {
   return SkFloatToScalar(std::isfinite(f) ? f : 0);
 }
 
 FloatPoint::FloatPoint(const IntPoint& p) : x_(p.X()), y_(p.Y()) {}
 
 FloatPoint::FloatPoint(const DoublePoint& p) : x_(p.X()), y_(p.Y()) {}
 
 FloatPoint::FloatPoint(const LayoutPoint& p)
     : x_(p.X().ToFloat()), y_(p.Y().ToFloat()) {}
 
@@ skipping 12 matching lines @@
   x_ += size.Width();
   y_ += size.Height();
 }
 
 void FloatPoint::MoveBy(const LayoutPoint& point) {
   x_ += point.X();
   y_ += point.Y();
 }
 
 SkPoint FloatPoint::Data() const {
-  SkPoint p = {WebCoreFloatToSkScalar(x_), WebCoreFloatToSkScalar(y_)};
+  SkPoint p = {WebCoreFloatToSkScalar2(x_), WebCoreFloatToSkScalar2(y_)};
   return p;
 }
 
 FloatPoint FloatPoint::NarrowPrecision(double x, double y) {
   return FloatPoint(clampTo<float>(x), clampTo<float>(y));
 }
 
 bool FindIntersection(const FloatPoint& p1,
                       const FloatPoint& p2,
                       const FloatPoint& d1,
@@ skipping 15 matching lines @@
   intersection.SetX(p1.X() + param * px_length);
   intersection.SetY(p1.Y() + param * py_length);
   return true;
 }
 
 String FloatPoint::ToString() const {
   return String::Format("%lg,%lg", X(), Y());
 }
 
 }  // namespace blink