Move GrIPoint16 to SkIPoint16 (and remove GrPoint.h)

samplecode/SampleRectanizer.cpp

Index: samplecode/SampleRectanizer.cpp
diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp
index fcb1cdb18eeb8c45588b45c8fd00f981c43c3063..691f57ada4496128b2d9434d0e6343d37d430b6d 100644
--- a/samplecode/SampleRectanizer.cpp
+++ b/samplecode/SampleRectanizer.cpp
@@ -40,7 +40,7 @@ public:
                         GrNextPow2(random.nextRangeU(kMinRectSize, kMaxRectSize)),
                         GrNextPow2(random.nextRangeU(kMinRectSize, kMaxRectSize)));
             *fRects[2].append() = SkISize::Make(128, 128);
-            *fRectLocations.append() = GrIPoint16::Make(0, 0);
+            *fRectLocations.append() = SkIPoint16::Make(0, 0);
         }
 
         fCurRects = &fRects[0];
@@ -142,7 +142,7 @@ private:
     int                   fCurRandRect;
     SkTDArray<SkISize>    fRects[3];
     SkTDArray<SkISize>*   fCurRects;
-    SkTDArray<GrIPoint16> fRectLocations;
+    SkTDArray<SkIPoint16> fRectLocations;
     GrRectanizer*         fRectanizers[2];
     GrRectanizer*         fCurRectanizer;