move SkIPoint16 to private header

Bug: skia:
Change-Id: Ib8045ac7cc24a44c4b70e73153c6faf098730b63
Reviewed-on: https://skia-review.googlesource.com/118721
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

2 files changed, 2 insertions, 43 deletions

diff --git a/include/atlastext/SkAtlasTextRenderer.h b/include/atlastext/SkAtlasTextRenderer.h
index f5eb5240c9..c4d74e8912 100644
--- a/include/atlastext/SkAtlasTextRenderer.h
+++ b/include/atlastext/SkAtlasTextRenderer.h
@@ -30,7 +30,8 @@ public:
         /** Color, same value for all four corners of a glyph quad. */
         uint32_t fColor;
         /** Texture coordinate (in texel units, not normalized). */
-        SkIPoint16 fTextureCoord;
+        int16_t fTextureCoordX;
+        int16_t fTextureCoordY;
     };
 
     virtual ~SkAtlasTextRenderer() = default;
diff --git a/include/core/SkPoint.h b/include/core/SkPoint.h
index f05a08c99d..e16d1e3a42 100644
--- a/include/core/SkPoint.h
+++ b/include/core/SkPoint.h
@@ -12,48 +12,6 @@
 #include "SkScalar.h"
 #include "../private/SkSafe32.h"
 
-/** \struct SkIPoint16
-    SkIPoint16 holds two 16 bit integer coordinates.
-*/
-struct SkIPoint16 {
-    int16_t fX; //!< x-axis value used by SkIPoint16
-
-    int16_t fY; //!< y-axis value used by SkIPoint16
-
-    /** Sets fX to x, fY to y. If SK_DEBUG is defined, asserts
-        if x or y does not fit in 16 bits.
-
-        @param x  integer x-axis value of constructed SkIPoint
-        @param y  integer y-axis value of constructed SkIPoint
-        @return   SkIPoint16 (x, y)
-    */
-    static constexpr SkIPoint16 Make(int x, int y) {
-        return {SkToS16(x), SkToS16(y)};
-    }
-
-    /** Returns x-axis value of SkIPoint16.
-
-        @return  fX
-    */
-    int16_t x() const { return fX; }
-
-    /** Returns y-axis value of SkIPoint.
-
-        @return  fY
-    */
-    int16_t y() const { return fY; }
-
-    /** Sets fX to x and fY to y.
-
-        @param x  new value for fX
-        @param y  new value for fY
-    */
-    void set(int x, int y) {
-        fX = SkToS16(x);
-        fY = SkToS16(y);
-    }
-};
-
 struct SkIPoint;
 typedef SkIPoint SkIVector;