remove unused declarations

Bug: skia:
Change-Id: If8ca5e3d649dab3cf8b2bdb1cf072ff23cea9465
Reviewed-on: https://skia-review.googlesource.com/90026
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

16 files changed, 22 insertions, 26 deletions

diff --git a/src/core/SkAutoPixmapStorage.h b/src/core/SkAutoPixmapStorage.h
index 7ee3a8a5c1..aedbdc6d49 100644
--- a/src/core/SkAutoPixmapStorage.h
+++ b/src/core/SkAutoPixmapStorage.h
@@ -11,7 +11,7 @@
 #include "SkMalloc.h"
 #include "SkPixmap.h"
 
-class SK_API SkAutoPixmapStorage : public SkPixmap {
+class SkAutoPixmapStorage : public SkPixmap {
 public:
     SkAutoPixmapStorage();
     ~SkAutoPixmapStorage();
diff --git a/src/core/SkBitmapDevice.h b/src/core/SkBitmapDevice.h
index 85a57281cd..b890066da6 100644
--- a/src/core/SkBitmapDevice.h
+++ b/src/core/SkBitmapDevice.h
@@ -33,7 +33,7 @@ class SkSurface;
 struct SkPoint;
 
 ///////////////////////////////////////////////////////////////////////////////
-class SK_API SkBitmapDevice : public SkBaseDevice {
+class SkBitmapDevice : public SkBaseDevice {
 public:
     /**
      *  Construct a new device with the specified bitmap as its backend. It is
diff --git a/src/core/SkClipStackDevice.h b/src/core/SkClipStackDevice.h
index de0f6297d4..a09c826dd8 100644
--- a/src/core/SkClipStackDevice.h
+++ b/src/core/SkClipStackDevice.h
@@ -11,7 +11,7 @@
 #include "SkClipStack.h"
 #include "SkDevice.h"
 
-class SK_API SkClipStackDevice : public SkBaseDevice {
+class SkClipStackDevice : public SkBaseDevice {
 public:
     SkClipStackDevice(const SkImageInfo& info, const SkSurfaceProps& props)
         : SkBaseDevice(info, props)
diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h
index f8eed4cbd4..6e63b14b3e 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.h
+++ b/src/core/SkColorMatrixFilterRowMajor255.h
@@ -10,7 +10,7 @@
 
 #include "SkColorFilter.h"
 
-class SK_API SkColorMatrixFilterRowMajor255 : public SkColorFilter {
+class SkColorMatrixFilterRowMajor255 : public SkColorFilter {
 public:
     SkColorMatrixFilterRowMajor255() {}
     explicit SkColorMatrixFilterRowMajor255(const SkScalar array[20]);
diff --git a/src/core/SkDevice.h b/src/core/SkDevice.h
index 3bd12ab36a..c7b993cf22 100644
--- a/src/core/SkDevice.h
+++ b/src/core/SkDevice.h
@@ -13,7 +13,6 @@
 #include "SkColor.h"
 #include "SkSurfaceProps.h"
 
-class SkAndroidFrameworkUtils;
 class SkBitmap;
 class SkDrawFilter;
 struct SkDrawShadowRec;
@@ -23,9 +22,8 @@ class SkMatrix;
 class SkRasterHandleAllocator;
 class SkRegion;
 class SkSpecialImage;
-class GrRenderTarget;
 
-class SK_API SkBaseDevice : public SkRefCnt {
+class SkBaseDevice : public SkRefCnt {
 public:
     SkBaseDevice(const SkImageInfo&, const SkSurfaceProps&);
 
@@ -353,7 +351,6 @@ private:
     friend class SkDraw;
     friend class SkDrawIter;
     friend class SkDeviceFilteredPaint;
-    friend class SkNoPixelsBitmapDevice;
     friend class SkSurface_Raster;
     friend class DeviceTestingAccess;
 
diff --git a/src/core/SkDither.h b/src/core/SkDither.h
index 685d11754e..b73f72e3df 100644
--- a/src/core/SkDither.h
+++ b/src/core/SkDither.h
@@ -183,8 +183,8 @@ static inline SkPMColor16 SkDitherARGB32To4444(SkPMColor c, unsigned dither)
 
     #define DITHER_VALUE(x) dither_scan[(x) & 3]
 #else
-    extern SK_API const uint16_t gDitherMatrix_4Bit_16[4];
-    extern SK_API const uint16_t gDitherMatrix_3Bit_16[4];
+    extern const uint16_t gDitherMatrix_4Bit_16[4];
+    extern const uint16_t gDitherMatrix_3Bit_16[4];
 
     #define DITHER_4444_SCAN(y) const uint16_t dither_scan = gDitherMatrix_4Bit_16[(y) & 3]
     #define DITHER_565_SCAN(y)  const uint16_t dither_scan = gDitherMatrix_3Bit_16[(y) & 3]
diff --git a/src/core/SkGeometry.h b/src/core/SkGeometry.h
index 96b617fc76..0e10df5151 100644
--- a/src/core/SkGeometry.h
+++ b/src/core/SkGeometry.h
@@ -89,7 +89,7 @@ int SkChopQuadAtMaxCurvature(const SkPoint src[3], SkPoint dst[5]);
     convert it into the cubic fitting the same curve. The new cubic
     curve is returned in dst[0..3].
 */
-SK_API void SkConvertQuadToCubic(const SkPoint src[3], SkPoint dst[4]);
+void SkConvertQuadToCubic(const SkPoint src[3], SkPoint dst[4]);
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -272,13 +272,13 @@ struct SkConic {
      *  return the power-of-2 number of quads needed to approximate this conic
      *  with a sequence of quads. Will be >= 0.
      */
-    int SK_API computeQuadPOW2(SkScalar tol) const;
+    int computeQuadPOW2(SkScalar tol) const;
 
     /**
      *  Chop this conic into N quads, stored continguously in pts[], where
      *  N = 1 << pow2. The amount of storage needed is (1 + 2 * N)
      */
-    int SK_API SK_WARN_UNUSED_RESULT chopIntoQuadsPOW2(SkPoint pts[], int pow2) const;
+    int SK_WARN_UNUSED_RESULT chopIntoQuadsPOW2(SkPoint pts[], int pow2) const;
 
     bool findXExtrema(SkScalar* t) const;
     bool findYExtrema(SkScalar* t) const;
diff --git a/src/core/SkHalf.h b/src/core/SkHalf.h
index a862990d4a..926137b45c 100644
--- a/src/core/SkHalf.h
+++ b/src/core/SkHalf.h
@@ -23,7 +23,7 @@ static constexpr uint16_t SK_Half1       = 0x3C00; // 1
 
 // convert between half and single precision floating point
 float SkHalfToFloat(SkHalf h);
-SkHalf SK_API SkFloatToHalf(float f);
+SkHalf SkFloatToHalf(float f);
 
 // Convert between half and single precision floating point,
 // assuming inputs and outputs are both finite, and may
diff --git a/src/core/SkImagePriv.h b/src/core/SkImagePriv.h
index 349402491d..509b7fa34f 100644
--- a/src/core/SkImagePriv.h
+++ b/src/core/SkImagePriv.h
@@ -43,7 +43,7 @@ sk_sp<SkShader> SkMakeBitmapShader(const SkBitmap& src, SkShader::TileMode, SkSh
  *  SkImageInfo, or the bitmap's pixels cannot be accessed, this will return
  *  nullptr.
  */
-extern SK_API sk_sp<SkImage> SkMakeImageFromRasterBitmap(const SkBitmap&, SkCopyPixelsMode);
+extern sk_sp<SkImage> SkMakeImageFromRasterBitmap(const SkBitmap&, SkCopyPixelsMode);
 
 /**
  *  Similar to SkMakeImageFromRasterBitmap, this wraps a |src| bitmap in an image.
diff --git a/src/core/SkLatticeIter.h b/src/core/SkLatticeIter.h
index 08cdd5a965..85de83232d 100644
--- a/src/core/SkLatticeIter.h
+++ b/src/core/SkLatticeIter.h
@@ -18,7 +18,7 @@ struct SkRect;
 /**
  *  Disect a lattice request into an sequence of src-rect / dst-rect pairs
  */
-class SK_API SkLatticeIter {
+class SkLatticeIter {
 public:
 
     static bool Valid(int imageWidth, int imageHeight, const SkCanvas::Lattice& lattice);
diff --git a/src/core/SkMatrixImageFilter.h b/src/core/SkMatrixImageFilter.h
index 3b451a4904..d5d2b71823 100644
--- a/src/core/SkMatrixImageFilter.h
+++ b/src/core/SkMatrixImageFilter.h
@@ -16,7 +16,7 @@
     input transformed by the given matrix.
  */
 
-class SK_API SkMatrixImageFilter : public SkImageFilter {
+class SkMatrixImageFilter : public SkImageFilter {
 public:
     /** Construct a 2D transformation image filter.
      *  @param transform     The matrix to apply when drawing the src bitmap
diff --git a/src/core/SkOpts.h b/src/core/SkOpts.h
index 6e6e16805a..9cf0ba9d8f 100644
--- a/src/core/SkOpts.h
+++ b/src/core/SkOpts.h
@@ -46,7 +46,7 @@ namespace SkOpts {
                         inverted_CMYK_to_BGR1; // i.e. convert color space
 
     extern void (*memset16)(uint16_t[], uint16_t, int);
-    extern void SK_API (*memset32)(uint32_t[], uint32_t, int);
+    extern void (*memset32)(uint32_t[], uint32_t, int);
     extern void (*memset64)(uint64_t[], uint64_t, int);
 
     // The fastest high quality 32-bit hash we can provide on this platform.
diff --git a/src/core/SkPM4f.h b/src/core/SkPM4f.h
index e1cb1cd27d..dd54403a7b 100644
--- a/src/core/SkPM4f.h
+++ b/src/core/SkPM4f.h
@@ -26,7 +26,7 @@ static inline Sk4f swizzle_rb_if_bgra(const Sk4f& x) {
 /*
  *  The float values are 0...1 premultiplied in RGBA order (regardless of SkPMColor order)
  */
-struct SK_API SkPM4f {
+struct SkPM4f {
     enum {
         R, G, B, A,
     };
diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp
index 3eee6656dd..8991713171 100644
--- a/src/core/SkPathEffect.cpp
+++ b/src/core/SkPathEffect.cpp
@@ -33,7 +33,7 @@ SkPathEffect::DashType SkPathEffect::asADash(DashInfo* info) const {
  including flattening them. It does nothing in filterPath, and is only useful
  for managing the lifetimes of its two arguments.
  */
-class SK_API SkPairPathEffect : public SkPathEffect {
+class SkPairPathEffect : public SkPathEffect {
 protected:
     SkPairPathEffect(sk_sp<SkPathEffect> pe0, sk_sp<SkPathEffect> pe1)
         : fPE0(std::move(pe0)), fPE1(std::move(pe1))
@@ -77,7 +77,7 @@ void SkPairPathEffect::toString(SkString* str) const {
  This subclass of SkPathEffect composes its two arguments, to create
  a compound pathEffect.
  */
-class SK_API SkComposePathEffect : public SkPairPathEffect {
+class SkComposePathEffect : public SkPairPathEffect {
 public:
     /** Construct a pathEffect whose effect is to apply first the inner pathEffect
      and the the outer pathEffect (e.g. outer(inner(path)))
@@ -147,7 +147,7 @@ void SkComposePathEffect::toString(SkString* str) const {
  This subclass of SkPathEffect applies two pathEffects, one after the other.
  Its filterPath() returns true if either of the effects succeeded.
  */
-class SK_API SkSumPathEffect : public SkPairPathEffect {
+class SkSumPathEffect : public SkPairPathEffect {
 public:
     /** Construct a pathEffect whose effect is to apply two effects, in sequence.
      (e.g. first(path) + second(path))
diff --git a/src/core/SkRefDict.h b/src/core/SkRefDict.h
index fec49ceb7a..cc2a7889bb 100644
--- a/src/core/SkRefDict.h
+++ b/src/core/SkRefDict.h
@@ -15,7 +15,7 @@
  *  A dictionary of string,refcnt pairs. The dictionary is also an owner of the
  *  refcnt objects while they are contained.
  */
-class SK_API SkRefDict : SkNoncopyable {
+class SkRefDict : SkNoncopyable {
 public:
     SkRefDict();
     ~SkRefDict();
diff --git a/src/core/SkWriteBuffer.h b/src/core/SkWriteBuffer.h
index 748254b065..bd3864cda2 100644
--- a/src/core/SkWriteBuffer.h
+++ b/src/core/SkWriteBuffer.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -21,7 +20,7 @@ class SkImage;
 class SkPath;
 class SkRefCntSet;
 
-class SK_API SkWriteBuffer {
+class SkWriteBuffer {
 public:
     SkWriteBuffer() {}
     virtual ~SkWriteBuffer() {}
@@ -76,7 +75,7 @@ protected:
 /**
  * Concrete implementation that serializes to a flat binary blob.
  */
-class SK_API SkBinaryWriteBuffer : public SkWriteBuffer {
+class SkBinaryWriteBuffer : public SkWriteBuffer {
 public:
     enum Flags {
         kCrossProcess_Flag = 1 << 0,