Index: cc/priority_calculator.cc |
diff --git a/cc/priority_calculator.cc b/cc/priority_calculator.cc |
index fc250d958fae412a782017e8f49cb137660a2673..8993f88e3723ad2f6ae5bec334292dcb1246ba3c 100644 |
--- a/cc/priority_calculator.cc |
+++ b/cc/priority_calculator.cc |
@@ -5,6 +5,7 @@ |
#include "config.h" |
#include "cc/priority_calculator.h" |
+#include "ui/gfx/rect.h" |
using namespace std; |
@@ -71,9 +72,9 @@ int PriorityCalculator::lingeringPriority(int previousPriority) |
} |
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); |
@@ -81,7 +82,7 @@ int manhattanDistance(const IntRect& a, const IntRect& b) |
} |
// 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) |