Remove 2d MapClippedQuad.

cc/base/math_util_unittest.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 "cc/base/math_util.h"
 
 #include <stdint.h>
 
 #include <cmath>
 
@@ skipping 557 matching lines @@
   gfx::Transform transform;
   transform.MakeIdentity();
   transform.ApplyPerspectiveDepth(50.0);
   transform.RotateAboutYAxis(89.0);
   // We are amost looking along the X-Y plane from (-50, almost 0)
 
   gfx::QuadF src_quad(gfx::PointF(0.0f, 100.0f), gfx::PointF(0.0f, -100.0f),
                       gfx::PointF(-99.0f, -300.0f),
                       gfx::PointF(-99.0f, -100.0f));
 
-  gfx::PointF clipped_quad[8];
+  gfx::Point3F clipped_quad[8];
   int num_vertices_in_clipped_quad;
 
-  MathUtil::MapClippedQuad(transform, src_quad, clipped_quad,
-                           &num_vertices_in_clipped_quad);
+  MathUtil::MapClippedQuad3d(transform, src_quad, clipped_quad,
+                             &num_vertices_in_clipped_quad);
 
   EXPECT_EQ(num_vertices_in_clipped_quad, 3);
 }
 
 // This takes a quad for which two points, (at x = -99) are behind and below
 // the eyepoint and checks to make sure we build a triangle.  We used to build
 // a degenerate quad.  The quirk here is that the two shared points are first
 // and last, not sequential.
 TEST(MathUtilTest, MapClippedQuadDuplicateTriangleWrapped) {
   gfx::Transform transform;
   transform.MakeIdentity();
   transform.ApplyPerspectiveDepth(50.0);
   transform.RotateAboutYAxis(89.0);
 
   gfx::QuadF src_quad(gfx::PointF(-99.0f, -100.0f), gfx::PointF(0.0f, 100.0f),
                       gfx::PointF(0.0f, -100.0f), gfx::PointF(-99.0f, -300.0f));
 
-  gfx::PointF clipped_quad[8];
+  gfx::Point3F clipped_quad[8];
   int num_vertices_in_clipped_quad;
 
-  MathUtil::MapClippedQuad(transform, src_quad, clipped_quad,
-                           &num_vertices_in_clipped_quad);
+  MathUtil::MapClippedQuad3d(transform, src_quad, clipped_quad,
+                             &num_vertices_in_clipped_quad);
 
   EXPECT_EQ(num_vertices_in_clipped_quad, 3);
 }
 
 // Here we map and clip a quad with only one point that disappears to infinity
 // behind us.  We don't want two vertices at infinity crossing in and out
 // of w < 0 space.
 TEST(MathUtilTest, MapClippedQuadDuplicateQuad) {
   gfx::Transform transform;
   transform.MakeIdentity();
   transform.ApplyPerspectiveDepth(50.0);
   transform.RotateAboutYAxis(89.0);
 
   gfx::QuadF src_quad(gfx::PointF(0.0f, 100.0f), gfx::PointF(400.0f, 0.0f),
                       gfx::PointF(0.0f, -100.0f), gfx::PointF(-99.0f, -300.0f));
 
-  gfx::PointF clipped_quad[8];
+  gfx::Point3F clipped_quad[8];
   int num_vertices_in_clipped_quad;
 
-  MathUtil::MapClippedQuad(transform, src_quad, clipped_quad,
-                           &num_vertices_in_clipped_quad);
+  MathUtil::MapClippedQuad3d(transform, src_quad, clipped_quad,
+                             &num_vertices_in_clipped_quad);
 
   EXPECT_EQ(num_vertices_in_clipped_quad, 4);
 }
 
 }  // namespace
 }  // namespace cc