Replace all instances of GrRect with SkRect.

And remove the typedef in GrRect.h. The same with GrIRect.

R=robertphillips@google.com

Author: tfarina@chromium.org

Review URL: https://chromiumcodereview.appspot.com/19449002

git-svn-id: http://skia.googlecode.com/svn/trunk@10130 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index 932fddb2a5..c3801d74c5 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -105,13 +105,13 @@ static void check_state(skiatest::Reporter* reporter,
                         const GrClipMaskCache& cache,
                         const SkClipStack& clip,
                         GrTexture* mask,
-                        const GrIRect& bound) {
+                        const SkIRect& bound) {
     SkClipStack cacheClip;
     REPORTER_ASSERT(reporter, clip.getTopmostGenID() == cache.getLastClipGenID());
 
     REPORTER_ASSERT(reporter, mask == cache.getLastMask());
 
-    GrIRect cacheBound;
+    SkIRect cacheBound;
     cache.getLastBound(&cacheBound);
     REPORTER_ASSERT(reporter, bound == cacheBound);
 }
@@ -131,14 +131,14 @@ static void test_cache(skiatest::Reporter* reporter, GrContext* context) {
     SkClipStack emptyClip;
     emptyClip.reset();
 
-    GrIRect emptyBound;
+    SkIRect emptyBound;
     emptyBound.setEmpty();
 
     // check initial state
     check_state(reporter, cache, emptyClip, NULL, emptyBound);
 
     // set the current state
-    GrIRect bound1;
+    SkIRect bound1;
     bound1.set(0, 0, 100, 100);
 
     SkClipStack clip1(bound1);
@@ -169,7 +169,7 @@ static void test_cache(skiatest::Reporter* reporter, GrContext* context) {
     REPORTER_ASSERT(reporter, texture1->getRefCnt());
 
     // modify the new state
-    GrIRect bound2;
+    SkIRect bound2;
     bound2.set(-10, -10, 10, 10);
 
     SkClipStack clip2(bound2);