Move GrIPoint16 to SkIPoint16 (and remove GrPoint.h)

R=bsalomon@google.com, reed@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/309683002

22 files changed, 48 insertions, 67 deletions

diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index a374ade344..568bc0e01e 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -25,7 +25,6 @@
       '<(skia_include_path)/gpu/GrKey.h',
       '<(skia_include_path)/gpu/GrPaint.h',
       '<(skia_include_path)/gpu/GrPathRendererChain.h',
-      '<(skia_include_path)/gpu/GrPoint.h',
       '<(skia_include_path)/gpu/GrRect.h',
       '<(skia_include_path)/gpu/GrRenderTarget.h',
       '<(skia_include_path)/gpu/GrSurface.h',
diff --git a/gyp/public_headers.gypi b/gyp/public_headers.gypi
index 7432d4c706..51194d5b4f 100644
--- a/gyp/public_headers.gypi
+++ b/gyp/public_headers.gypi
@@ -59,7 +59,6 @@
       'gpu/GrRenderTarget.h',
       'gpu/GrSurface.h',
       'gpu/GrTypesPriv.h',
-      'gpu/GrPoint.h',
       'config/sk_stdint.h',
       'config/SkUserConfig.h',
       'pipe/SkGPipe.h',
diff --git a/include/core/SkPoint.h b/include/core/SkPoint.h
index 5dd331a14c..6f32d98c75 100644
--- a/include/core/SkPoint.h
+++ b/include/core/SkPoint.h
@@ -11,6 +11,28 @@
 #include "SkMath.h"
 #include "SkScalar.h"
 
+/** \struct SkIPoint16
+
+    SkIPoint holds two 16 bit integer coordinates
+*/
+struct SkIPoint16 {
+    int16_t fX, fY;
+
+    static SkIPoint16 Make(int x, int y) {
+        SkIPoint16 pt;
+        pt.set(x, y);
+        return pt;
+    }
+
+    int16_t x() const { return fX; }
+    int16_t y() const { return fY; }
+
+    void set(int x, int y) {
+        fX = SkToS16(x);
+        fY = SkToS16(y);
+    }
+};
+
 /** \struct SkIPoint
 
     SkIPoint holds two 32 bit integer coordinates
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index c54f2e6b23..41ee15917f 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -12,7 +12,6 @@
 #include "GrColor.h"
 #include "GrPaint.h"
 #include "GrPathRendererChain.h"
-#include "GrPoint.h"
 #include "GrRenderTarget.h"
 #include "GrTexture.h"
 #include "SkMatrix.h"
diff --git a/include/gpu/GrGlyph.h b/include/gpu/GrGlyph.h
index 6de0c57d98..a7d834153f 100644
--- a/include/gpu/GrGlyph.h
+++ b/include/gpu/GrGlyph.h
@@ -26,7 +26,7 @@ struct GrGlyph {
     SkPath*     fPath;
     PackedID    fPackedID;
     GrIRect16   fBounds;
-    GrIPoint16  fAtlasLocation;
+    SkIPoint16  fAtlasLocation;
 
     void init(GrGlyph::PackedID packed, const SkIRect& bounds) {
         fPlot = NULL;
diff --git a/include/gpu/GrPoint.h b/include/gpu/GrPoint.h
deleted file mode 100644
index 16738f5243..0000000000
--- a/include/gpu/GrPoint.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-
-#ifndef GrPoint_DEFINED
-#define GrPoint_DEFINED
-
-#include "GrTypes.h"
-#include "SkScalar.h"
-#include "SkPoint.h"
-
-struct GrIPoint16 {
-    int16_t fX, fY;
-
-    static GrIPoint16 Make(intptr_t x, intptr_t y) {
-        GrIPoint16 pt;
-        pt.set(x, y);
-        return pt;
-    }
-
-    int16_t x() const { return fX; }
-    int16_t y() const { return fY; }
-
-    void set(intptr_t x, intptr_t y) {
-        fX = SkToS16(x);
-        fY = SkToS16(y);
-    }
-};
-
-#endif
diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp
index fcb1cdb18e..691f57ada4 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;
 
diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
index cc98b925c2..331f5d92aa 100644
--- a/src/gpu/GrAtlas.cpp
+++ b/src/gpu/GrAtlas.cpp
@@ -48,13 +48,13 @@ void GrPlot::init(GrAtlasMgr* mgr, int offX, int offY, int width, int height, si
     fBatchUploads = batchUploads;
 }
 
-static inline void adjust_for_offset(GrIPoint16* loc, const GrIPoint16& offset) {
+static inline void adjust_for_offset(SkIPoint16* loc, const SkIPoint16& offset) {
     loc->fX += offset.fX;
     loc->fY += offset.fY;
 }
 
 bool GrPlot::addSubImage(int width, int height, const void* image,
-                          GrIPoint16* loc) {
+                         SkIPoint16* loc) {
     float percentFull = fRects->percentFull();
     if (!fRects->addRect(width, height, loc)) {
         return false;
@@ -203,7 +203,7 @@ void GrAtlasMgr::moveToHead(GrPlot* plot) {
 
 GrPlot* GrAtlasMgr::addToAtlas(GrAtlas* atlas,
                                int width, int height, const void* image,
-                               GrIPoint16* loc) {
+                               SkIPoint16* loc) {
     // iterate through entire plot list for this atlas, see if we can find a hole
     // last one was most recently added and probably most empty
     for (int i = atlas->fPlots.count()-1; i >= 0; --i) {
diff --git a/src/gpu/GrAtlas.h b/src/gpu/GrAtlas.h
index b3affe20a4..47048a81c7 100644
--- a/src/gpu/GrAtlas.h
+++ b/src/gpu/GrAtlas.h
@@ -10,7 +10,7 @@
 #define GrAtlas_DEFINED
 
 
-#include "GrPoint.h"
+#include "SkPoint.h"
 #include "GrTexture.h"
 #include "GrDrawTarget.h"
 
@@ -35,7 +35,7 @@ public:
 
     GrTexture* texture() const { return fTexture; }
 
-    bool addSubImage(int width, int height, const void*, GrIPoint16*);
+    bool addSubImage(int width, int height, const void*, SkIPoint16*);
 
     GrDrawTarget::DrawToken drawToken() const { return fDrawToken; }
     void setDrawToken(GrDrawTarget::DrawToken draw) { fDrawToken = draw; }
@@ -57,7 +57,7 @@ private:
     GrTexture*              fTexture;
     GrRectanizer*           fRects;
     GrAtlasMgr*             fAtlasMgr;
-    GrIPoint16              fOffset;        // the offset of the plot in the backing texture
+    SkIPoint16              fOffset;        // the offset of the plot in the backing texture
     size_t                  fBytesPerPixel;
     SkIRect                 fDirtyRect;
     bool                    fDirty;
@@ -76,7 +76,7 @@ public:
 
     // add subimage of width, height dimensions to atlas
     // returns the containing GrPlot and location relative to the backing texture
-    GrPlot* addToAtlas(GrAtlas*, int width, int height, const void*, GrIPoint16*);
+    GrPlot* addToAtlas(GrAtlas*, int width, int height, const void*, SkIPoint16*);
 
     // remove reference to this plot
     bool removePlot(GrAtlas* atlas, const GrPlot* plot);
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index de28600ddf..78739ec680 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -13,7 +13,6 @@
 #include "GrColor.h"
 #include "GrEffectStage.h"
 #include "GrPaint.h"
-#include "GrPoint.h"
 #include "GrRenderTarget.h"
 #include "GrStencil.h"
 #include "GrTemplates.h"
diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index 4931f47db7..801d163e5d 100644
--- a/src/gpu/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
@@ -12,7 +12,6 @@
 #include "GrGpu.h"
 #include "GrIndexBuffer.h"
 #include "GrPath.h"
-#include "GrPoint.h"
 #include "GrRenderTarget.h"
 #include "GrTemplates.h"
 #include "GrTexture.h"
diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp
index 81921e36c8..8e4eeb0a31 100644
--- a/src/gpu/GrPathUtils.cpp
+++ b/src/gpu/GrPathUtils.cpp
@@ -7,7 +7,7 @@
 
 #include "GrPathUtils.h"
 
-#include "GrPoint.h"
+#include "GrTypes.h"
 #include "SkGeometry.h"
 
 SkScalar GrPathUtils::scaleToleranceToSrc(SkScalar devTol,
diff --git a/src/gpu/GrPathUtils.h b/src/gpu/GrPathUtils.h
index d6c18ea4a8..c15fd7ae10 100644
--- a/src/gpu/GrPathUtils.h
+++ b/src/gpu/GrPathUtils.h
@@ -8,7 +8,6 @@
 #ifndef GrPathUtils_DEFINED
 #define GrPathUtils_DEFINED
 
-#include "GrPoint.h"
 #include "SkRect.h"
 #include "SkPath.h"
 #include "SkTArray.h"
diff --git a/src/gpu/GrPlotMgr.h b/src/gpu/GrPlotMgr.h
index 8d55ed0b9c..1441611327 100644
--- a/src/gpu/GrPlotMgr.h
+++ b/src/gpu/GrPlotMgr.h
@@ -9,7 +9,6 @@
 #define GrPlotMgr_DEFINED
 
 #include "GrTypes.h"
-#include "GrPoint.h"
 #include "SkTypes.h"
 
 class GrPlotMgr : SkNoncopyable {
@@ -35,7 +34,7 @@ public:
         sk_bzero(fBusy, fDim.fX * fDim.fY);
     }
 
-    bool newPlot(GrIPoint16* loc) {
+    bool newPlot(SkIPoint16* loc) {
         char* busy = fBusy;
         for (int y = 0; y < fDim.fY; y++) {
             for (int x = 0; x < fDim.fX; x++) {
@@ -68,7 +67,7 @@ private:
     };
     char fStorage[STORAGE];
     char* fBusy;
-    GrIPoint16  fDim;
+    SkIPoint16  fDim;
 };
 
 #endif
diff --git a/src/gpu/GrRectanizer.h b/src/gpu/GrRectanizer.h
index 0f9d8fdfb6..dc697c41d7 100644
--- a/src/gpu/GrRectanizer.h
+++ b/src/gpu/GrRectanizer.h
@@ -8,7 +8,9 @@
 #ifndef GrRectanizer_DEFINED
 #define GrRectanizer_DEFINED
 
-#include "GrPoint.h"
+#include "GrTypes.h"
+
+struct SkIPoint16;
 
 class GrRectanizer {
 public:
@@ -26,7 +28,7 @@ public:
 
     // Attempt to add a rect. Return true on success; false on failure. If
     // successful the position in the atlas is returned in 'loc'.
-    virtual bool addRect(int width, int height, GrIPoint16* loc) = 0;
+    virtual bool addRect(int width, int height, SkIPoint16* loc) = 0;
     virtual float percentFull() const = 0;
 
     /**
diff --git a/src/gpu/GrRectanizer_pow2.cpp b/src/gpu/GrRectanizer_pow2.cpp
index 5da7e04528..2d443cab8c 100644
--- a/src/gpu/GrRectanizer_pow2.cpp
+++ b/src/gpu/GrRectanizer_pow2.cpp
@@ -8,7 +8,7 @@
 
 #include "GrRectanizer_pow2.h"
 
-bool GrRectanizerPow2::addRect(int width, int height, GrIPoint16* loc) {
+bool GrRectanizerPow2::addRect(int width, int height, SkIPoint16* loc) {
     if ((unsigned)width > (unsigned)this->width() ||
         (unsigned)height > (unsigned)this->height()) {
         return false;
diff --git a/src/gpu/GrRectanizer_pow2.h b/src/gpu/GrRectanizer_pow2.h
index e9d9d02b0a..7bf2b868c0 100644
--- a/src/gpu/GrRectanizer_pow2.h
+++ b/src/gpu/GrRectanizer_pow2.h
@@ -9,6 +9,7 @@
 #define GrRectanizer_pow2_DEFINED
 
 #include "GrRectanizer.h"
+#include "SkPoint.h"
 
 // This Rectanizer quantizes the incoming rects to powers of 2. Each power
 // of two can have, at most, one active row/shelf. Once a row/shelf for
@@ -29,7 +30,7 @@ public:
         sk_bzero(fRows, sizeof(fRows));
     }
 
-    virtual bool addRect(int w, int h, GrIPoint16* loc) SK_OVERRIDE;
+    virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
 
     virtual float percentFull() const SK_OVERRIDE {
         return fAreaSoFar / ((float)this->width() * this->height());
@@ -40,7 +41,7 @@ private:
     static const int kMaxExponent = 16;
 
     struct Row {
-        GrIPoint16  fLoc;
+        SkIPoint16  fLoc;
         // fRowHeight is actually known by this struct's position in fRows
         // but it is used to signal if there exists an open row of this height
         int         fRowHeight;
diff --git a/src/gpu/GrRectanizer_skyline.cpp b/src/gpu/GrRectanizer_skyline.cpp
index 200fa83279..b759cb22ac 100755
--- a/src/gpu/GrRectanizer_skyline.cpp
+++ b/src/gpu/GrRectanizer_skyline.cpp
@@ -7,8 +7,9 @@
  */
 
 #include "GrRectanizer_skyline.h"
+#include "SkPoint.h"
 
-bool GrRectanizerSkyline::addRect(int width, int height, GrIPoint16* loc) {
+bool GrRectanizerSkyline::addRect(int width, int height, SkIPoint16* loc) {
     if ((unsigned)width > (unsigned)this->width() ||
         (unsigned)height > (unsigned)this->height()) {
         return false;
diff --git a/src/gpu/GrRectanizer_skyline.h b/src/gpu/GrRectanizer_skyline.h
index 01c433db15..2062667d7c 100644
--- a/src/gpu/GrRectanizer_skyline.h
+++ b/src/gpu/GrRectanizer_skyline.h
@@ -30,7 +30,7 @@ public:
         seg->fWidth = this->width();
     }
 
-    virtual bool addRect(int w, int h, GrIPoint16* loc) SK_OVERRIDE;
+    virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
 
     virtual float percentFull() const SK_OVERRIDE{
         return fAreaSoFar / ((float)this->width() * this->height());
diff --git a/src/gpu/GrTextContext.h b/src/gpu/GrTextContext.h
index 4cede1dd9d..c139e22295 100644
--- a/src/gpu/GrTextContext.h
+++ b/src/gpu/GrTextContext.h
@@ -8,7 +8,6 @@
 #ifndef GrTextContext_DEFINED
 #define GrTextContext_DEFINED
 
-#include "GrPoint.h"
 #include "GrGlyph.h"
 #include "GrPaint.h"
 #include "SkDeviceProperties.h"
diff --git a/src/gpu/GrTextStrike.h b/src/gpu/GrTextStrike.h
index f71b82c88b..955eb7fd00 100644
--- a/src/gpu/GrTextStrike.h
+++ b/src/gpu/GrTextStrike.h
@@ -14,7 +14,6 @@
 #include "GrAllocPool.h"
 #include "GrFontScaler.h"
 #include "GrTHashTable.h"
-#include "GrPoint.h"
 #include "GrGlyph.h"
 #include "GrDrawTarget.h"
 #include "GrAtlas.h"
diff --git a/tests/GpuRectanizerTest.cpp b/tests/GpuRectanizerTest.cpp
index 08664b4fb1..ec396ef863 100644
--- a/tests/GpuRectanizerTest.cpp
+++ b/tests/GpuRectanizerTest.cpp
@@ -22,7 +22,7 @@ static void test_rectanizer_basic(skiatest::Reporter* reporter, GrRectanizer* re
     REPORTER_ASSERT(reporter, kWidth == rectanizer->width());
     REPORTER_ASSERT(reporter, kHeight == rectanizer->height());
 
-    GrIPoint16 loc;
+    SkIPoint16 loc;
 
     REPORTER_ASSERT(reporter, rectanizer->addRect(50, 50, &loc));
     REPORTER_ASSERT(reporter, rectanizer->percentFull() > 0.0f);
@@ -35,7 +35,7 @@ static void test_rectanizer_inserts(skiatest::Reporter*,
                                     const SkTDArray<SkISize>& rects) {
     int i;
     for (i = 0; i < rects.count(); ++i) {
-        GrIPoint16 loc;
+        SkIPoint16 loc;
         if (!rectanizer->addRect(rects[i].fWidth, rects[i].fHeight, &loc)) {
             break;
         }