summaryrefslogtreecommitdiffstats
path: root/cc/layer_sorter.cc
diff options
context:
space:
mode:
authorshawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 08:29:00 +0000
committershawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 08:29:00 +0000
commitc8686a05e1fa4cb3aa82690d7450791828096840 (patch)
treec43ef1a56ac27a06bc1ed7c069850cf7c6790002 /cc/layer_sorter.cc
parent5006a4185d3a95976ced07022188f9abb48790be (diff)
downloadchromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.zip
chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.tar.gz
chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.tar.bz2
Animation code is not yet migrated by this patch, due to WebTransformOperations.
BUG=159972 Review URL: https://codereview.chromium.org/11308153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_sorter.cc')
-rw-r--r--cc/layer_sorter.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc
index 0ab998f..48ec30a 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();