Move GrIPoint16 to SkIPoint16 (and remove GrPoint.h)

samplecode/SampleRectanizer.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SampleCode.h"
 #include "SkRandom.h"
@@ skipping 22 matching lines @@
         fRectLocations.setReserve(kNumRandRects);
 
         SkRandom random;
         for (int i = 0; i < kNumRandRects; ++i) {
             *fRects[0].append() = SkISize::Make(random.nextRangeU(kMinRectSize, kMaxRectSize),
                                                 random.nextRangeU(kMinRectSize, kMaxRectSize));
             *fRects[1].append() = SkISize::Make(
                         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];
 
         fRectanizers[0] = new GrRectanizerPow2(kWidth, kHeight);
         fRectanizers[1] = new GrRectanizerSkyline(kWidth, kHeight);
         fCurRectanizer = fRectanizers[0];
     }
 
 protected:
@@ skipping 81 matching lines @@
     static const int kHeight = 1024;
     static const int kNumRandRects = 200;
     static const char kCycleRectanizerKey = 'j';
     static const char kCycleRectsKey = 'h';
     static const int kMinRectSize = 2;
     static const int kMaxRectSize = 256;
 
     int                   fCurRandRect;
     SkTDArray<SkISize>    fRects[3];
     SkTDArray<SkISize>*   fCurRects;
-    SkTDArray<GrIPoint16> fRectLocations;
+    SkTDArray<SkIPoint16> fRectLocations;
     GrRectanizer*         fRectanizers[2];
     GrRectanizer*         fCurRectanizer;
 
     const char* getRectanizerName() const {
         if (fCurRectanizer == fRectanizers[0]) {
             return "Pow2";
         } else {
             return "Skyline";
         }
     }
@@ skipping 33 matching lines @@
     }
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 static SkView* MyFactory() { return new RectanizerView; }
 static SkViewRegister reg(MyFactory);
 
 #endif