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

Unified Diff: cc/layer_sorter.cc

Issue 11308153: Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch for landing 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_sorter.h ('k') | cc/layer_sorter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_sorter.cc
diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc
index 0ab998f50283fe0f71cd80fc85d18fc870893a10..48ec30a84e7f88e31efe6acd5f5f8480b9920206 100644
--- a/cc/layer_sorter.cc
+++ b/cc/layer_sorter.cc
@@ -12,10 +12,9 @@
#include "base/logging.h"
#include "cc/math_util.h"
#include "cc/render_surface_impl.h"
-#include <public/WebTransformationMatrix.h>
+#include "ui/gfx/transform.h"
using namespace std;
-using WebKit::WebTransformationMatrix;
namespace cc {
@@ -146,7 +145,7 @@ LayerShape::LayerShape()
{
}
-LayerShape::LayerShape(float width, float height, const WebTransformationMatrix& drawTransform)
+LayerShape::LayerShape(float width, float height, const gfx::Transform& drawTransform)
{
gfx::QuadF layerQuad(gfx::RectF(0, 0, width, height));
@@ -230,7 +229,7 @@ void LayerSorter::createGraphNodes(LayerList::iterator first, LayerList::iterato
DVLOG(2) << "Layer " << node.layer->id() << " (" << node.layer->bounds().width() << " x " << node.layer->bounds().height() << ")";
- WebTransformationMatrix drawTransform;
+ gfx::Transform drawTransform;
float layerWidth, layerHeight;
if (renderSurface) {
drawTransform = renderSurface->drawTransform();
« no previous file with comments | « cc/layer_sorter.h ('k') | cc/layer_sorter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698