1 files changed, 19 insertions, 15 deletions
diff --git a/cc/damage_tracker.h b/cc/damage_tracker.h
index 59a13401..4680662b 100644
--- a/cc/damage_tracker.h
+++ b/cc/damage_tracker.h
@@ -7,15 +7,19 @@
 
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
-#include "FloatRect.h"
+#include "ui/gfx/rect_f.h"
 #include <vector>
 
+class SkImageFilter;
+
+namespace gfx {
+class Rect;
+}
+
 namespace WebKit {
 class WebFilterOperations;
 }
 
-class SkImageFilter;
-
 namespace cc {
 
 class LayerImpl;
@@ -28,34 +32,34 @@ public:
     static scoped_ptr<DamageTracker> create();
     ~DamageTracker();
 
-    void didDrawDamagedArea() { m_currentDamageRect = FloatRect(); }
+    void didDrawDamagedArea() { m_currentDamageRect = gfx::RectF(); }
     void forceFullDamageNextUpdate() { m_forceFullDamageNextUpdate = true; }
-    void updateDamageTrackingState(const std::vector<LayerImpl*>& layerList, int targetSurfaceLayerID, bool targetSurfacePropertyChangedOnlyFromDescendant, const IntRect& targetSurfaceContentRect, LayerImpl* targetSurfaceMaskLayer, const WebKit::WebFilterOperations&, SkImageFilter* filter);
+    void updateDamageTrackingState(const std::vector<LayerImpl*>& layerList, int targetSurfaceLayerID, bool targetSurfacePropertyChangedOnlyFromDescendant, const gfx::Rect& targetSurfaceContentRect, LayerImpl* targetSurfaceMaskLayer, const WebKit::WebFilterOperations&, SkImageFilter* filter);
 
-    const FloatRect& currentDamageRect() { return m_currentDamageRect; }
+    const gfx::RectF& currentDamageRect() { return m_currentDamageRect; }
 
 private:
     DamageTracker();
 
-    FloatRect trackDamageFromActiveLayers(const std::vector<LayerImpl*>& layerList, int targetSurfaceLayerID);
-    FloatRect trackDamageFromSurfaceMask(LayerImpl* targetSurfaceMaskLayer);
-    FloatRect trackDamageFromLeftoverRects();
+    gfx::RectF trackDamageFromActiveLayers(const std::vector<LayerImpl*>& layerList, int targetSurfaceLayerID);
+    gfx::RectF trackDamageFromSurfaceMask(LayerImpl* targetSurfaceMaskLayer);
+    gfx::RectF trackDamageFromLeftoverRects();
 
-    FloatRect removeRectFromCurrentFrame(int layerID, bool& layerIsNew);
-    void saveRectForNextFrame(int layerID, const FloatRect& targetSpaceRect);
+    gfx::RectF removeRectFromCurrentFrame(int layerID, bool& layerIsNew);
+    void saveRectForNextFrame(int layerID, const gfx::RectF& targetSpaceRect);
 
     // These helper functions are used only in trackDamageFromActiveLayers().
-    void extendDamageForLayer(LayerImpl*, FloatRect& targetDamageRect);
-    void extendDamageForRenderSurface(LayerImpl*, FloatRect& targetDamageRect);
+    void extendDamageForLayer(LayerImpl*, gfx::RectF& targetDamageRect);
+    void extendDamageForRenderSurface(LayerImpl*, gfx::RectF& targetDamageRect);
 
     // To correctly track exposed regions, two hashtables of rects are maintained.
     // The "current" map is used to compute exposed regions of the current frame, while
     // the "next" map is used to collect layer rects that are used in the next frame.
-    typedef base::hash_map<int, FloatRect> RectMap;
+    typedef base::hash_map<int, gfx::RectF> RectMap;
     scoped_ptr<RectMap> m_currentRectHistory;
     scoped_ptr<RectMap> m_nextRectHistory;
 
-    FloatRect m_currentDamageRect;
+    gfx::RectF m_currentDamageRect;
     bool m_forceFullDamageNextUpdate;
 };