Move SkTArray to include/private.

TBR=reed
Agreed moving to private is good.

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

12 files changed, 11 insertions, 19 deletions

diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index 689d52b827..b5f98d29ba 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -8,6 +8,7 @@
 #ifndef SkImageFilter_DEFINED
 #define SkImageFilter_DEFINED
 
+#include "../private/SkTArray.h"
 #include "../private/SkTemplates.h"
 #include "../private/SkMutex.h"
 #include "SkFilterQuality.h"
@@ -15,7 +16,6 @@
 #include "SkMatrix.h"
 #include "SkRect.h"
 #include "SkSurfaceProps.h"
-#include "SkTArray.h"
 
 class GrFragmentProcessor;
 class GrTexture;
diff --git a/include/core/SkString.h b/include/core/SkString.h
index 4625dd13cc..42466af80b 100644
--- a/include/core/SkString.h
+++ b/include/core/SkString.h
@@ -10,8 +10,8 @@
 #ifndef SkString_DEFINED
 #define SkString_DEFINED
 
+#include "../private/SkTArray.h"
 #include "SkScalar.h"
-#include "SkTArray.h"
 
 #include <stdarg.h>
 
diff --git a/include/core/SkTextBlob.h b/include/core/SkTextBlob.h
index b0ab8929e6..e43ff74a85 100644
--- a/include/core/SkTextBlob.h
+++ b/include/core/SkTextBlob.h
@@ -8,10 +8,9 @@
 #ifndef SkTextBlob_DEFINED
 #define SkTextBlob_DEFINED
 
+#include "../private/SkTemplates.h"
 #include "SkPaint.h"
 #include "SkRefCnt.h"
-#include "SkTArray.h"
-#include "SkTDArray.h"
 
 class SkReadBuffer;
 class SkWriteBuffer;
diff --git a/include/gpu/GrProcessorUnitTest.h b/include/gpu/GrProcessorUnitTest.h
index bb16d69fd5..8442d7ef71 100644
--- a/include/gpu/GrProcessorUnitTest.h
+++ b/include/gpu/GrProcessorUnitTest.h
@@ -8,8 +8,8 @@
 #ifndef GrProcessorUnitTest_DEFINED
 #define GrProcessorUnitTest_DEFINED
 
+#include "../private/SkTArray.h"
 #include "GrTestUtils.h"
-#include "SkTArray.h"
 #include "SkTypes.h"
 
 class SkMatrix;
diff --git a/include/gpu/GrProgramElement.h b/include/gpu/GrProgramElement.h
index 8305c5027b..ba9daf7154 100644
--- a/include/gpu/GrProgramElement.h
+++ b/include/gpu/GrProgramElement.h
@@ -8,8 +8,8 @@
 #ifndef GrProgramElement_DEFINED
 #define GrProgramElement_DEFINED
 
+#include "../private/SkTArray.h"
 #include "SkRefCnt.h"
-#include "SkTArray.h"
 
 class GrGpuResourceRef;
 
diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h
index 4646abdd7d..e04a912d3e 100644
--- a/include/gpu/GrTypesPriv.h
+++ b/include/gpu/GrTypesPriv.h
@@ -9,7 +9,6 @@
 #define GrTypesPriv_DEFINED
 
 #include "GrTypes.h"
-#include "SkTArray.h"
 #include "SkRect.h"
 
  /**
diff --git a/include/gpu/gl/GrGLExtensions.h b/include/gpu/gl/GrGLExtensions.h
index fe3187057c..dd088de671 100644
--- a/include/gpu/gl/GrGLExtensions.h
+++ b/include/gpu/gl/GrGLExtensions.h
@@ -8,9 +8,9 @@
 #ifndef GrGLExtensions_DEFINED
 #define GrGLExtensions_DEFINED
 
+#include "../../private/SkTArray.h"
 #include "GrGLFunctions.h"
 #include "SkString.h"
-#include "SkTArray.h"
 
 struct GrGLInterface;
 
diff --git a/include/pathops/SkPathOps.h b/include/pathops/SkPathOps.h
index 047588b635..18c7952f4a 100644
--- a/include/pathops/SkPathOps.h
+++ b/include/pathops/SkPathOps.h
@@ -7,8 +7,8 @@
 #ifndef SkPathOps_DEFINED
 #define SkPathOps_DEFINED
 
+#include "../private/SkTArray.h"
 #include "SkPreConfig.h"
-#include "SkTArray.h"
 #include "SkTDArray.h"
 
 class SkPath;
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h
index 304961fd78..063cb9d553 100644
--- a/include/ports/SkFontConfigInterface.h
+++ b/include/ports/SkFontConfigInterface.h
@@ -11,7 +11,6 @@
 #include "SkDataTable.h"
 #include "SkFontStyle.h"
 #include "SkRefCnt.h"
-#include "SkTArray.h"
 #include "SkTypeface.h"
 
 struct SkBaseMutex;
@@ -116,11 +115,6 @@ public:
     // New APIS, which have default impls for now (which do nothing)
 
     virtual SkDataTable* getFamilyNames() { return SkDataTable::NewEmpty(); }
-    virtual bool matchFamilySet(const char[] /*inFamilyName*/,
-                                SkString* /*outFamilyName*/,
-                                SkTArray<FontIdentity>*) {
-        return false;
-    }
     typedef SkRefCnt INHERITED;
 };
 
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h
index 9d96fee687..37502d2404 100644
--- a/include/ports/SkFontMgr_indirect.h
+++ b/include/ports/SkFontMgr_indirect.h
@@ -8,12 +8,12 @@
 #ifndef SkFontMgr_indirect_DEFINED
 #define SkFontMgr_indirect_DEFINED
 
+#include "../private/SkMutex.h"
+#include "../private/SkTArray.h"
 #include "SkDataTable.h"
 #include "SkFontMgr.h"
-#include "../private/SkMutex.h"
 #include "SkRefCnt.h"
 #include "SkRemotableFontMgr.h"
-#include "SkTArray.h"
 #include "SkTypeface.h"
 #include "SkTypes.h"
 
diff --git a/include/core/SkTArray.h b/include/private/SkTArray.h
index 5330e49307..5330e49307 100644
--- a/include/core/SkTArray.h
+++ b/include/private/SkTArray.h
diff --git a/include/utils/SkRTConf.h b/include/utils/SkRTConf.h
index 6c7963c64e..80a972c47b 100644
--- a/include/utils/SkRTConf.h
+++ b/include/utils/SkRTConf.h
@@ -9,10 +9,10 @@
 #ifndef SkRTConf_DEFINED
 #define SkRTConf_DEFINED
 
-#include "SkTArray.h"
+#include "../private/SkTDict.h"
 #include "SkString.h"
 #include "SkStream.h"
-#include "../private/SkTDict.h"
+#include "SkTDArray.h"
 
 /** \class SkRTConfBase
     Non-templated base class for the runtime configs