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

Unified Diff: cc/damage_tracker.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: Rebased to tip of tree and addressed feedback 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
Index: cc/damage_tracker.cc
diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc
index e10461d9aa771fbf8db685ce1e70b277b5e7c4f1..90bda68ac0b911af1aa328a02a2e449e32d64b2a 100644
--- a/cc/damage_tracker.cc
+++ b/cc/damage_tracker.cc
@@ -10,7 +10,7 @@
#include "cc/render_surface_impl.h"
#include <public/WebFilterOperations.h>
-using WebKit::WebTransformationMatrix;
+using gfx::Transform;
danakj 2012/11/24 02:34:54 don't using it, let's say gfx:: explicitly at each
namespace cc {
@@ -306,12 +306,12 @@ void DamageTracker::extendDamageForRenderSurface(LayerImpl* layer, gfx::RectF& t
// If there was damage, transform it to target space, and possibly contribute its reflection if needed.
if (!damageRectInLocalSpace.IsEmpty()) {
- const WebTransformationMatrix& drawTransform = renderSurface->drawTransform();
+ const Transform& drawTransform = renderSurface->drawTransform();
gfx::RectF damageRectInTargetSpace = MathUtil::mapClippedRect(drawTransform, damageRectInLocalSpace);
targetDamageRect.Union(damageRectInTargetSpace);
if (layer->replicaLayer()) {
- const WebTransformationMatrix& replicaDrawTransform = renderSurface->replicaDrawTransform();
+ const Transform& replicaDrawTransform = renderSurface->replicaDrawTransform();
targetDamageRect.Union(MathUtil::mapClippedRect(replicaDrawTransform, damageRectInLocalSpace));
}
}
@@ -323,7 +323,7 @@ void DamageTracker::extendDamageForRenderSurface(LayerImpl* layer, gfx::RectF& t
bool replicaIsNew = false;
removeRectFromCurrentFrame(replicaMaskLayer->id(), replicaIsNew);
- const WebTransformationMatrix& replicaDrawTransform = renderSurface->replicaDrawTransform();
+ const Transform& replicaDrawTransform = renderSurface->replicaDrawTransform();
gfx::RectF replicaMaskLayerRect = MathUtil::mapClippedRect(replicaDrawTransform, gfx::RectF(gfx::PointF(), replicaMaskLayer->bounds()));
saveRectForNextFrame(replicaMaskLayer->id(), replicaMaskLayerRect);

Powered by Google App Engine
This is Rietveld 408576698