Move SkTDArray to private.

TBR=reed Moving to private is good. Review URL: https://codereview.chromium.org/1707213002
2016-02-18 08:53:33 -08:00 · 2016-02-18 08:53:33 -08:00 · a7e9f05119
commit a7e9f05119
parent 3b087f4010
24 changed files with 19 additions and 23 deletions
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@ -386,7 +386,6 @@
        '<(skia_include_path)/core/SkString.h',
        '<(skia_include_path)/core/SkStrokeRec.h',
        '<(skia_include_path)/core/SkSurface.h',
-        '<(skia_include_path)/core/SkTDArray.h',
        '<(skia_include_path)/core/SkTDStack.h',
        '<(skia_include_path)/core/SkTInternalLList.h',
        '<(skia_include_path)/core/SkTRegistry.h',
@ -415,6 +414,7 @@
        '<(skia_include_path)/private/SkSpinlock.h',
        '<(skia_include_path)/private/SkTemplates.h',
        '<(skia_include_path)/private/SkTArray.h',
+        '<(skia_include_path)/private/SkTDArray.h',
        '<(skia_include_path)/private/SkTHash.h',
        '<(skia_include_path)/private/SkThreadID.h',
        '<(skia_include_path)/private/SkTDict.h',
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@ -13,6 +13,7 @@
        'skia_lib.gyp:skia_lib',
      ],
      'include_dirs': [
+        '../include/private',
        '../include/xml',
      ],
      'sources': [
--- a/include/core/SkClipStack.h
+++ b/include/core/SkClipStack.h
@ -13,7 +13,6 @@
 #include "SkRect.h"
 #include "SkRRect.h"
 #include "SkRegion.h"
-#include "SkTDArray.h"
 #include "SkTLazy.h"

 class SkCanvasClipVisitor;
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@ -10,7 +10,6 @@

 #include "SkColor.h"
 #include "SkFlattenable.h"
-#include "SkTDArray.h"
 #include "SkXfermode.h"

 class GrContext;
--- a/include/core/SkDataTable.h
+++ b/include/core/SkDataTable.h
@ -8,10 +8,10 @@
 #ifndef SkDataTable_DEFINED
 #define SkDataTable_DEFINED

+#include "../private/SkTDArray.h"
 #include "SkChunkAlloc.h"
 #include "SkData.h"
 #include "SkString.h"
-#include "SkTDArray.h"

 /**
 *  Like SkData, SkDataTable holds an immutable data buffer. The data buffer is
--- a/include/core/SkMultiPictureDraw.h
+++ b/include/core/SkMultiPictureDraw.h
@ -8,8 +8,8 @@
 #ifndef SkMultiPictureDraw_DEFINED
 #define SkMultiPictureDraw_DEFINED

+#include "../private/SkTDArray.h"
 #include "SkMatrix.h"
-#include "SkTDArray.h"

 class SkCanvas;
 class SkPaint;
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@ -10,7 +10,6 @@

 #include "SkMatrix.h"
 #include "SkPathRef.h"
-#include "SkTDArray.h"
 #include "SkRefCnt.h"

 class SkReader32;
--- a/include/core/SkPathEffect.h
+++ b/include/core/SkPathEffect.h
@ -14,7 +14,6 @@
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "SkRect.h"
-#include "SkTDArray.h"

 class SkPath;
 class SkStrokeRec;
--- a/include/core/SkPathMeasure.h
+++ b/include/core/SkPathMeasure.h
@ -8,8 +8,8 @@
 #ifndef SkPathMeasure_DEFINED
 #define SkPathMeasure_DEFINED

+#include "../private/SkTDArray.h"
 #include "SkPath.h"
-#include "SkTDArray.h"

 struct SkConic;

--- a/include/core/SkPathRef.h
+++ b/include/core/SkPathRef.h
@ -9,12 +9,12 @@
 #ifndef SkPathRef_DEFINED
 #define SkPathRef_DEFINED

+#include "../private/SkTDArray.h"
 #include "SkMatrix.h"
 #include "SkPoint.h"
 #include "SkRRect.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
-#include "SkTDArray.h"
 #include <stddef.h> // ptrdiff_t

 class SkRBuffer;
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@ -9,15 +9,15 @@
 #define SkPixelRef_DEFINED

 #include "../private/SkAtomics.h"
+#include "../private/SkMutex.h"
+#include "../private/SkTDArray.h"
 #include "SkBitmap.h"
 #include "SkFilterQuality.h"
 #include "SkImageInfo.h"
-#include "../private/SkMutex.h"
 #include "SkPixmap.h"
 #include "SkRefCnt.h"
 #include "SkSize.h"
 #include "SkString.h"
-#include "SkTDArray.h"

 class SkColorTable;
 class SkData;
--- a/include/pathops/SkPathOps.h
+++ b/include/pathops/SkPathOps.h
@ -8,8 +8,8 @@
 #define SkPathOps_DEFINED

 #include "../private/SkTArray.h"
+#include "../private/SkTDArray.h"
 #include "SkPreConfig.h"
-#include "SkTDArray.h"

 class SkPath;
 struct SkRect;
--- a/include/private/SkTDArray.h
+++ b/include/private/SkTDArray.h
--- a/include/utils/SkLayer.h
+++ b/include/utils/SkLayer.h
@ -10,8 +10,8 @@
 #ifndef SkLayer_DEFINED
 #define SkLayer_DEFINED

+#include "../private/SkTDArray.h"
 #include "SkRefCnt.h"
-#include "SkTDArray.h"
 #include "SkColor.h"
 #include "SkMatrix.h"
 #include "SkPoint.h"
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@ -9,8 +9,8 @@
 #ifndef SkNWayCanvas_DEFINED
 #define SkNWayCanvas_DEFINED

+#include "../private/SkTDArray.h"
 #include "SkCanvas.h"
-#include "SkTDArray.h"

 class SK_API SkNWayCanvas : public SkCanvas {
 public:
--- a/include/utils/SkRTConf.h
+++ b/include/utils/SkRTConf.h
@ -9,10 +9,10 @@
 #ifndef SkRTConf_DEFINED
 #define SkRTConf_DEFINED

+#include "../private/SkTDArray.h"
 #include "../private/SkTDict.h"
 #include "SkString.h"
 #include "SkStream.h"
-#include "SkTDArray.h"

 /** \class SkRTConfBase
    Non-templated base class for the runtime configs
--- a/include/views/SkOSMenu.h
+++ b/include/views/SkOSMenu.h
@ -10,8 +10,8 @@
 #ifndef SkOSMenu_DEFINED
 #define SkOSMenu_DEFINED

+#include "../private/SkTDArray.h"
 #include "SkEvent.h"
-#include "SkTDArray.h"

 class SkOSMenu {
 public:
--- a/include/views/SkTouchGesture.h
+++ b/include/views/SkTouchGesture.h
@ -8,7 +8,7 @@
 #ifndef SkTouchGesture_DEFINED
 #define SkTouchGesture_DEFINED

-#include "SkTDArray.h"
+#include "../private/SkTDArray.h"
 #include "SkMatrix.h"

 struct SkFlingState {
--- a/include/views/SkWidget.h
+++ b/include/views/SkWidget.h
@ -12,7 +12,6 @@
 #include "SkDOM.h"
 #include "SkPaint.h"
 #include "SkString.h"
-#include "SkTDArray.h"
 #include "SkTextBox.h"
 #include "SkView.h"

--- a/include/views/SkWindow.h
+++ b/include/views/SkWindow.h
@ -8,6 +8,7 @@
 #ifndef SkWindow_DEFINED
 #define SkWindow_DEFINED

+#include "../private/SkTDArray.h"
 #include "SkView.h"
 #include "SkBitmap.h"
 #include "SkMatrix.h"
@ -15,7 +16,6 @@
 #include "SkEvent.h"
 #include "SkKey.h"
 #include "SkSurfaceProps.h"
-#include "SkTDArray.h"

 class SkSurface;
 class SkOSMenu;
--- a/include/xml/SkXMLWriter.h
+++ b/include/xml/SkXMLWriter.h
@ -8,7 +8,7 @@
 #ifndef SkXMLWriter_DEFINED
 #define SkXMLWriter_DEFINED

-#include "SkTDArray.h"
+#include "../private/SkTDArray.h"
 #include "SkString.h"
 #include "SkDOM.h"

--- a/tools/flags/SkCommandLineFlags.h
+++ b/tools/flags/SkCommandLineFlags.h
@ -9,8 +9,8 @@
 #define SK_COMMAND_LINE_FLAGS_H

 #include "../private/SkTArray.h"
+#include "../private/SkTDArray.h"
 #include "SkString.h"
-#include "SkTDArray.h"

 /**
 *  Including this file (and compiling SkCommandLineFlags.cpp) provides command line
--- a/tools/skdiff.h
+++ b/tools/skdiff.h
@ -12,7 +12,7 @@
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkString.h"
-#include "SkTDArray.h"
+#include "../private/SkTDArray.h"

 #if defined(SK_BUILD_FOR_WIN32)
    #define PATH_DIV_STR "\\"
--- a/tools/skdiff_main.cpp
+++ b/tools/skdiff_main.cpp
@ -14,7 +14,7 @@
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
-#include "SkTDArray.h"
+#include "../private/SkTDArray.h"
 #include "../private/SkTSearch.h"

 #include <stdlib.h>