1 files changed, 16 insertions, 15 deletions

diff --git a/chromium/cc/trees/damage_tracker.h b/chromium/cc/trees/damage_tracker.h
index 37a1900f788..37c4c6ec9eb 100644
--- a/chromium/cc/trees/damage_tracker.h
+++ b/chromium/cc/trees/damage_tracker.h
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_lists.h"
-#include "ui/gfx/rect_f.h"
+#include "ui/gfx/rect.h"
 
 class SkImageFilter;
 
@@ -31,38 +31,39 @@ class CC_EXPORT DamageTracker {
   static scoped_ptr<DamageTracker> Create();
   ~DamageTracker();
 
-  void DidDrawDamagedArea() { current_damage_rect_ = gfx::RectF(); }
-  void AddDamageNextUpdate(gfx::RectF dmg) { current_damage_rect_.Union(dmg); }
+  void DidDrawDamagedArea() { current_damage_rect_ = gfx::Rect(); }
+  void AddDamageNextUpdate(const gfx::Rect& dmg) {
+    current_damage_rect_.Union(dmg);
+  }
   void UpdateDamageTrackingState(
       const LayerImplList& layer_list,
       int target_surface_layer_id,
       bool target_surface_property_changed_only_from_descendant,
-      gfx::Rect target_surface_content_rect,
+      const gfx::Rect& target_surface_content_rect,
       LayerImpl* target_surface_mask_layer,
       const FilterOperations& filters);
 
-  gfx::RectF current_damage_rect() { return current_damage_rect_; }
+  gfx::Rect current_damage_rect() { return current_damage_rect_; }
 
  private:
   DamageTracker();
 
-  gfx::RectF TrackDamageFromActiveLayers(
-      const LayerImplList& layer_list,
-      int target_surface_layer_id);
-  gfx::RectF TrackDamageFromSurfaceMask(LayerImpl* target_surface_mask_layer);
-  gfx::RectF TrackDamageFromLeftoverRects();
+  gfx::Rect TrackDamageFromActiveLayers(const LayerImplList& layer_list,
+                                        int target_surface_layer_id);
+  gfx::Rect TrackDamageFromSurfaceMask(LayerImpl* target_surface_mask_layer);
+  gfx::Rect TrackDamageFromLeftoverRects();
 
   void PrepareRectHistoryForUpdate();
 
   // These helper functions are used only in TrackDamageFromActiveLayers().
-  void ExtendDamageForLayer(LayerImpl* layer, gfx::RectF* target_damage_rect);
+  void ExtendDamageForLayer(LayerImpl* layer, gfx::Rect* target_damage_rect);
   void ExtendDamageForRenderSurface(LayerImpl* layer,
-                                    gfx::RectF* target_damage_rect);
+                                    gfx::Rect* target_damage_rect);
 
   struct RectMapData {
     RectMapData() : layer_id_(0), mailboxId_(0) {}
     explicit RectMapData(int layer_id) : layer_id_(layer_id), mailboxId_(0) {}
-    void Update(const gfx::RectF& rect, unsigned int mailboxId) {
+    void Update(const gfx::Rect& rect, unsigned int mailboxId) {
       mailboxId_ = mailboxId;
       rect_ = rect;
     }
@@ -73,7 +74,7 @@ class CC_EXPORT DamageTracker {
 
     int layer_id_;
     unsigned int mailboxId_;
-    gfx::RectF rect_;
+    gfx::Rect rect_;
   };
   typedef std::vector<RectMapData> SortedRectMap;
 
@@ -82,7 +83,7 @@ class CC_EXPORT DamageTracker {
   SortedRectMap rect_history_;
 
   unsigned int mailboxId_;
-  gfx::RectF current_damage_rect_;
+  gfx::Rect current_damage_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(DamageTracker);
 };