Replace all instances of GrRect with SkRect.

include/gpu/GrRect.h

Index: include/gpu/GrRect.h
diff --git a/include/gpu/GrRect.h b/include/gpu/GrRect.h
index 821e137030847397e8d3fd646763e3b3a983da39..cacc5117b5324af74297543a458a7b93409cc4a0 100644
--- a/include/gpu/GrRect.h
+++ b/include/gpu/GrRect.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2010 Google Inc.
  *
@@ -6,17 +5,12 @@
  * found in the LICENSE file.
  */
 
-
-
 #ifndef GrRect_DEFINED
 #define GrRect_DEFINED
 
-#include "GrPoint.h"
+#include "SkTypes.h"
 #include "SkRect.h"
 
-typedef SkIRect GrIRect;
-typedef SkRect  GrRect;
-
 struct GrIRect16 {
     int16_t fLeft, fTop, fRight, fBottom;
 
@@ -25,7 +19,7 @@ struct GrIRect16 {
     int area() const { return this->width() * this->height(); }
     bool isEmpty() const { return fLeft >= fRight || fTop >= fBottom; }
 
-    void set(const GrIRect& r) {
+    void set(const SkIRect& r) {
         fLeft   = SkToS16(r.fLeft);
         fTop    = SkToS16(r.fTop);
         fRight  = SkToS16(r.fRight);