Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2808)

Unified Diff: cc/math_util.h

Issue 11369018: cc: Switch from WebCore::FloatPoint3D to gfx::Point3F and gfx::Vector3dF in the compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missing base files Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/cc.gyp ('K') | « cc/layer_sorter.cc ('k') | cc/math_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/math_util.h
diff --git a/cc/math_util.h b/cc/math_util.h
index 104acf1ac2c5b08050d4972061be94ebdfabcbf3..06b25d97eaca1484fab44a600222038dee2daeac 100644
--- a/cc/math_util.h
+++ b/cc/math_util.h
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "ui/gfx/point_f.h"
-#include "FloatPoint3D.h"
+#include "ui/gfx/point3_f.h"
namespace WebKit {
class WebTransformationMatrix;
@@ -48,15 +48,15 @@ struct HomogeneousCoordinate {
return gfx::PointF(x * invW, y * invW);
}
- FloatPoint3D cartesianPoint3d() const
+ gfx::Point3F cartesianPoint3d() const
{
if (w == 1)
- return FloatPoint3D(x, y, z);
+ return gfx::Point3F(x, y, z);
// For now, because this code is used privately only by MathUtil, it should never be called when w == 0, and we do not yet need to handle that case.
DCHECK(w);
double invW = 1.0 / w;
- return FloatPoint3D(x * invW, y * invW, z * invW);
+ return gfx::Point3F(x * invW, y * invW, z * invW);
}
double x;
@@ -93,7 +93,7 @@ public:
// correctly detect the clipped condition via the boolean clipped.
static FloatQuad mapQuad(const WebKit::WebTransformationMatrix&, const FloatQuad&, bool& clipped);
static gfx::PointF mapPoint(const WebKit::WebTransformationMatrix&, const gfx::PointF&, bool& clipped);
- static FloatPoint3D mapPoint(const WebKit::WebTransformationMatrix&, const FloatPoint3D&, bool& clipped);
+ static gfx::Point3F mapPoint(const WebKit::WebTransformationMatrix&, const gfx::Point3F&, bool& clipped);
static FloatQuad projectQuad(const WebKit::WebTransformationMatrix&, const FloatQuad&, bool& clipped);
static gfx::PointF projectPoint(const WebKit::WebTransformationMatrix&, const gfx::PointF&, bool& clipped);
« cc/cc.gyp ('K') | « cc/layer_sorter.cc ('k') | cc/math_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698