cc: Use gfx:: Geometry types for positions, bounds, and related things.

cc/priority_calculator.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/priority_calculator.h"
+#include "ui/gfx/rect.h"
 
 using namespace std;
 
 namespace cc {
 
 static const int nothingPriorityCutoff = -3;
 
 static const int mostHighPriority = -2;
 
 static const int uiDrawsToRootSurfacePriority = -1;
@@ skipping 46 matching lines @@
 int PriorityCalculator::lingeringPriority(int previousPriority)
 {
     // FIXME: We should remove this once we have priorities for all
     //        textures (we can't currently calculate distances for
     //        off-screen textures).
     return min(lingeringLimitPriority,
                max(lingeringBasePriority, previousPriority + 1));
 }
 
 namespace {
-int manhattanDistance(const IntRect& a, const IntRect& b)
+int manhattanDistance(const gfx::Rect& a, const gfx::Rect& b)
 {
-    IntRect c = unionRect(a, b);
+    gfx::Rect c = gfx::UnionRects(a, b);
     int x = max(0, c.width() - a.width() - b.width() + 1);
     int y = max(0, c.height() - a.height() - b.height() + 1);
     return (x + y);
 }
 }
 
 // static
-int PriorityCalculator::priorityFromDistance(const IntRect& visibleRect, const IntRect& textureRect, bool drawsToRootSurface)
+int PriorityCalculator::priorityFromDistance(const gfx::Rect& visibleRect, const gfx::Rect& textureRect, bool drawsToRootSurface)
 {
     int distance = manhattanDistance(visibleRect, textureRect);
     if (!distance)
         return visiblePriority(drawsToRootSurface);
     return min(notVisibleLimitPriority, notVisibleBasePriority + distance);
 }
 
 // static
 int PriorityCalculator::smallAnimatedLayerMinPriority()
 {
@@ skipping 30 matching lines @@
     return visibleAndNearbyPriorityCutoff;
 }
 
 // static
 int PriorityCalculator::allowEverythingCutoff()
 {
     return everythingPriorityCutoff;
 }
 
 } // cc