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

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

Index: third_party/WebKit/Source/platform/geometry/FloatPoint.cpp
diff --git a/third_party/WebKit/Source/platform/geometry/FloatPoint.cpp b/third_party/WebKit/Source/platform/geometry/FloatPoint.cpp
index 1d2cc9c58b202ca32ea262f71998b991a87ef83e..a417956d41c60875910767dd99968b7ed8337f82 100644
--- a/third_party/WebKit/Source/platform/geometry/FloatPoint.cpp
+++ b/third_party/WebKit/Source/platform/geometry/FloatPoint.cpp
@@ -37,8 +37,9 @@
 
 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);
 }
 
@@ -71,7 +72,7 @@ void FloatPoint::MoveBy(const LayoutPoint& point) {
 }
 
 SkPoint FloatPoint::Data() const {
-  SkPoint p = {WebCoreFloatToSkScalar(x_), WebCoreFloatToSkScalar(y_)};
+  SkPoint p = {WebCoreFloatToSkScalar2(x_), WebCoreFloatToSkScalar2(y_)};
   return p;
 }