cc: Switch from WebCore::FloatPoint3D to gfx::Point3F and gfx::Vector3dF in the compositor

cc/math_util.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/math_util.h"
 
 #include "FloatQuad.h"
 #include "FloatSize.h"
@@ skipping 22 matching lines @@
     // implicit definition of w = 1;
 
     double outX = x * transform.m11() + y * transform.m21() + z * transform.m31() + transform.m41();
     double outY = x * transform.m12() + y * transform.m22() + z * transform.m32() + transform.m42();
     double outZ = x * transform.m13() + y * transform.m23() + z * transform.m33() + transform.m43();
     double outW = x * transform.m14() + y * transform.m24() + z * transform.m34() + transform.m44();
 
     return HomogeneousCoordinate(outX, outY, outZ, outW);
 }
 
-static HomogeneousCoordinate mapHomogeneousPoint(const WebTransformationMatrix& transform, const FloatPoint3D& p)
+static HomogeneousCoordinate mapHomogeneousPoint(const WebTransformationMatrix& transform, const gfx::Point3F& p)
 {
     double x = p.x();
     double y = p.y();
     double z = p.z();
     // implicit definition of w = 1;
 
     double outX = x * transform.m11() + y * transform.m21() + z * transform.m31() + transform.m41();
     double outY = x * transform.m12() + y * transform.m22() + z * transform.m32() + transform.m42();
     double outZ = x * transform.m13() + y * transform.m23() + z * transform.m33() + transform.m43();
     double outW = x * transform.m14() + y * transform.m24() + z * transform.m34() + transform.m44();
@@ skipping 52 matching lines @@
 gfx::RectF MathUtil::mapClippedRect(const WebTransformationMatrix& transform, const gfx::RectF& srcRect)
 {
     if (transform.isIdentityOrTranslation()) {
         gfx::RectF mappedRect(srcRect);
         mappedRect.Offset(static_cast<float>(transform.m41()), static_cast<float>(transform.m42()));
         return mappedRect;
     }
 
     // Apply the transform, but retain the result in homogeneous coordinates.
     FloatQuad q = FloatQuad(gfx::RectF(srcRect));
-    HomogeneousCoordinate h1 = mapHomogeneousPoint(transform, q.p1());
-    HomogeneousCoordinate h2 = mapHomogeneousPoint(transform, q.p2());
-    HomogeneousCoordinate h3 = mapHomogeneousPoint(transform, q.p3());
-    HomogeneousCoordinate h4 = mapHomogeneousPoint(transform, q.p4());
+    HomogeneousCoordinate h1 = mapHomogeneousPoint(transform, gfx::Point3F(q.p1()));
+    HomogeneousCoordinate h2 = mapHomogeneousPoint(transform, gfx::Point3F(q.p2()));
+    HomogeneousCoordinate h3 = mapHomogeneousPoint(transform, gfx::Point3F(q.p3()));
+    HomogeneousCoordinate h4 = mapHomogeneousPoint(transform, gfx::Point3F(q.p4()));
 
     return computeEnclosingClippedRect(h1, h2, h3, h4);
 }
 
 gfx::RectF MathUtil::projectClippedRect(const WebTransformationMatrix& transform, const gfx::RectF& srcRect)
 {
     // Perform the projection, but retain the result in homogeneous coordinates.
     FloatQuad q = FloatQuad(gfx::RectF(srcRect));
     HomogeneousCoordinate h1 = projectHomogeneousPoint(transform, q.p1());
     HomogeneousCoordinate h2 = projectHomogeneousPoint(transform, q.p2());
     HomogeneousCoordinate h3 = projectHomogeneousPoint(transform, q.p3());
     HomogeneousCoordinate h4 = projectHomogeneousPoint(transform, q.p4());
 
     return computeEnclosingClippedRect(h1, h2, h3, h4);
 }
 
 void MathUtil::mapClippedQuad(const WebTransformationMatrix& transform, const FloatQuad& srcQuad, gfx::PointF clippedQuad[8], int& numVerticesInClippedQuad)
 {
-    HomogeneousCoordinate h1 = mapHomogeneousPoint(transform, srcQuad.p1());
-    HomogeneousCoordinate h2 = mapHomogeneousPoint(transform, srcQuad.p2());
-    HomogeneousCoordinate h3 = mapHomogeneousPoint(transform, srcQuad.p3());
-    HomogeneousCoordinate h4 = mapHomogeneousPoint(transform, srcQuad.p4());
+    HomogeneousCoordinate h1 = mapHomogeneousPoint(transform, gfx::Point3F(srcQuad.p1()));
+    HomogeneousCoordinate h2 = mapHomogeneousPoint(transform, gfx::Point3F(srcQuad.p2()));
+    HomogeneousCoordinate h3 = mapHomogeneousPoint(transform, gfx::Point3F(srcQuad.p3()));
+    HomogeneousCoordinate h4 = mapHomogeneousPoint(transform, gfx::Point3F(srcQuad.p4()));
 
     // The order of adding the vertices to the array is chosen so that clockwise / counter-clockwise orientation is retained.
 
     numVerticesInClippedQuad = 0;
 
     if (!h1.shouldBeClipped())
         addVertexToClippedQuad(h1.cartesianPoint2d(), clippedQuad, numVerticesInClippedQuad);
 
     if (h1.shouldBeClipped() ^ h2.shouldBeClipped())
         addVertexToClippedQuad(computeClippedPointForEdge(h1, h2).cartesianPoint2d(), clippedQuad, numVerticesInClippedQuad);
@@ skipping 87 matching lines @@
 
 FloatQuad MathUtil::mapQuad(const WebTransformationMatrix& transform, const FloatQuad& q, bool& clipped)
 {
     if (transform.isIdentityOrTranslation()) {
         FloatQuad mappedQuad(q);
         mappedQuad.move(static_cast<float>(transform.m41()), static_cast<float>(transform.m42()));
         clipped = false;
         return mappedQuad;
     }
 
-    HomogeneousCoordinate h1 = mapHomogeneousPoint(transform, q.p1());
-    HomogeneousCoordinate h2 = mapHomogeneousPoint(transform, q.p2());
-    HomogeneousCoordinate h3 = mapHomogeneousPoint(transform, q.p3());
-    HomogeneousCoordinate h4 = mapHomogeneousPoint(transform, q.p4());
+    HomogeneousCoordinate h1 = mapHomogeneousPoint(transform, gfx::Point3F(q.p1()));
+    HomogeneousCoordinate h2 = mapHomogeneousPoint(transform, gfx::Point3F(q.p2()));
+    HomogeneousCoordinate h3 = mapHomogeneousPoint(transform, gfx::Point3F(q.p3()));
+    HomogeneousCoordinate h4 = mapHomogeneousPoint(transform, gfx::Point3F(q.p4()));
 
     clipped = h1.shouldBeClipped() || h2.shouldBeClipped() || h3.shouldBeClipped() || h4.shouldBeClipped();
 
     // Result will be invalid if clipped == true. But, compute it anyway just in case, to emulate existing behavior.
     return FloatQuad(h1.cartesianPoint2d(), h2.cartesianPoint2d(), h3.cartesianPoint2d(), h4.cartesianPoint2d());
 }
 
 gfx::PointF MathUtil::mapPoint(const WebTransformationMatrix& transform, const gfx::PointF& p, bool& clipped)
 {
-    HomogeneousCoordinate h = mapHomogeneousPoint(transform, cc::FloatPoint(p));
+    HomogeneousCoordinate h = mapHomogeneousPoint(transform, gfx::Point3F(p));
 
     if (h.w > 0) {
         clipped = false;
         return h.cartesianPoint2d();
     }
 
     // The cartesian coordinates will be invalid after dividing by w.
     clipped = true;
 
     // Avoid dividing by w if w == 0.
     if (!h.w)
         return gfx::PointF();
 
     // This return value will be invalid because clipped == true, but (1) users of this
     // code should be ignoring the return value when clipped == true anyway, and (2) this
     // behavior is more consistent with existing behavior of WebKit transforms if the user
     // really does not ignore the return value.
     return h.cartesianPoint2d();
 }
 
-FloatPoint3D MathUtil::mapPoint(const WebTransformationMatrix& transform, const FloatPoint3D& p, bool& clipped)
+gfx::Point3F MathUtil::mapPoint(const WebTransformationMatrix& transform, const gfx::Point3F& p, bool& clipped)
 {
     HomogeneousCoordinate h = mapHomogeneousPoint(transform, p);
 
     if (h.w > 0) {
         clipped = false;
         return h.cartesianPoint3d();
     }
 
     // The cartesian coordinates will be invalid after dividing by w.
     clipped = true;
 
     // Avoid dividing by w if w == 0.
     if (!h.w)
-        return FloatPoint3D();
+        return gfx::Point3F();
 
     // This return value will be invalid because clipped == true, but (1) users of this
     // code should be ignoring the return value when clipped == true anyway, and (2) this
     // behavior is more consistent with existing behavior of WebKit transforms if the user
     // really does not ignore the return value.
     return h.cartesianPoint3d();
 }
 
 FloatQuad MathUtil::projectQuad(const WebTransformationMatrix& transform, const FloatQuad& q, bool& clipped)
 {
@@ skipping 79 matching lines @@
 }
 
 FloatSize MathUtil::projectVector(const FloatSize& source, const FloatSize& destination)
 {
     float sourceDotDestination = source.width() * destination.width() + source.height() * destination.height();
     float projectedLength = sourceDotDestination / destination.diagonalLengthSquared();
     return FloatSize(projectedLength * destination.width(), projectedLength * destination.height());
 }
 
 } // namespace cc