[Pinch-to-zoom] Moved scale factor into PinchViewport

Source/platform/geometry/FloatPoint.h

 /*
  * 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 105 matching lines @@
     float lengthSquared() const
     {
         return m_x * m_x + m_y * m_y;
     }
 
     FloatPoint expandedTo(const FloatPoint& other) const
     {
         return FloatPoint(std::max(m_x, other.m_x), std::max(m_y, other.m_y));
     }
 
+    FloatPoint shrunkTo(const FloatPoint& other) const
+    {
+        return FloatPoint(std::min(m_x, other.m_x), std::min(m_y, other.m_y));
+    }
+
     FloatPoint transposedPoint() const
     {
         return FloatPoint(m_y, m_x);
     }
 
 #if OS(MACOSX)
     FloatPoint(const CGPoint&);
     operator CGPoint() const;
 #if defined(__OBJC__) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     FloatPoint(const NSPoint&);
@@ skipping 93 matching lines @@
 }
 
 PLATFORM_EXPORT float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c);
 
 // Find point where lines through the two pairs of points intersect. Returns false if the lines don't intersect.
 PLATFORM_EXPORT bool findIntersection(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection);
 
 }
 
 #endif