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

Unified Diff: cc/layer_quad.cc

Issue 11364044: cc: Replace WebCore::FloatQuad with gfx::QuadF. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reeebase. 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
« no previous file with comments | « cc/layer_quad.h ('k') | cc/layer_quad_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_quad.cc
diff --git a/cc/layer_quad.cc b/cc/layer_quad.cc
index a510ea89bbeebf8a2d82ccae63097e2fde0777a4..0a668739d763c713bdc5a68dca7bc685dc5bf75f 100644
--- a/cc/layer_quad.cc
+++ b/cc/layer_quad.cc
@@ -7,6 +7,7 @@
#include "cc/layer_quad.h"
#include "base/logging.h"
+#include "ui/gfx/quad_f.h"
namespace cc {
@@ -21,7 +22,7 @@ LayerQuad::Edge::Edge(const gfx::PointF& p, const gfx::PointF& q)
scale(1.0f / tangent.Length());
}
-LayerQuad::LayerQuad(const FloatQuad& quad)
+LayerQuad::LayerQuad(const gfx::QuadF& quad)
{
// Create edges.
m_left = Edge(quad.p4(), quad.p1());
@@ -29,7 +30,7 @@ LayerQuad::LayerQuad(const FloatQuad& quad)
m_top = Edge(quad.p1(), quad.p2());
m_bottom = Edge(quad.p3(), quad.p4());
- float sign = quad.isCounterclockwise() ? -1 : 1;
+ float sign = quad.IsCounterClockwise() ? -1 : 1;
m_left.scale(sign);
m_right.scale(sign);
m_top.scale(sign);
@@ -44,9 +45,9 @@ LayerQuad::LayerQuad(const Edge& left, const Edge& top, const Edge& right, const
{
}
-FloatQuad LayerQuad::floatQuad() const
+gfx::QuadF LayerQuad::ToQuadF() const
{
- return FloatQuad(m_left.intersect(m_top),
+ return gfx::QuadF(m_left.intersect(m_top),
m_top.intersect(m_right),
m_right.intersect(m_bottom),
m_bottom.intersect(m_left));
« no previous file with comments | « cc/layer_quad.h ('k') | cc/layer_quad_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698