aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gyp/core.gypi2
-rw-r--r--gyp/xml.gyp1
-rw-r--r--include/core/SkClipStack.h1
-rw-r--r--include/core/SkColorFilter.h1
-rw-r--r--include/core/SkDataTable.h2
-rw-r--r--include/core/SkMultiPictureDraw.h2
-rw-r--r--include/core/SkPath.h1
-rw-r--r--include/core/SkPathEffect.h1
-rw-r--r--include/core/SkPathMeasure.h2
-rw-r--r--include/core/SkPathRef.h2
-rw-r--r--include/core/SkPixelRef.h4
-rw-r--r--include/pathops/SkPathOps.h2
-rw-r--r--include/private/SkTDArray.h (renamed from include/core/SkTDArray.h)0
-rw-r--r--include/utils/SkLayer.h2
-rw-r--r--include/utils/SkNWayCanvas.h2
-rw-r--r--include/utils/SkRTConf.h2
-rw-r--r--include/views/SkOSMenu.h2
-rw-r--r--include/views/SkTouchGesture.h2
-rw-r--r--include/views/SkWidget.h1
-rw-r--r--include/views/SkWindow.h2
-rw-r--r--include/xml/SkXMLWriter.h2
-rw-r--r--tools/flags/SkCommandLineFlags.h2
-rw-r--r--tools/skdiff.h2
-rw-r--r--tools/skdiff_main.cpp2
24 files changed, 19 insertions, 23 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 5af30602ac..d268ec2725 100644
--- 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',
diff --git a/gyp/xml.gyp b/gyp/xml.gyp
index c5cdd58c8c..946b223767 100644
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@@ -13,6 +13,7 @@
'skia_lib.gyp:skia_lib',
],
'include_dirs': [
+ '../include/private',
'../include/xml',
],
'sources': [
diff --git a/include/core/SkClipStack.h b/include/core/SkClipStack.h
index b74e47697f..38d6d6751d 100644
--- 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;
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index ad97a730ee..ea893e056f 100644
--- 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;
diff --git a/include/core/SkDataTable.h b/include/core/SkDataTable.h
index 798ca9c0c4..c9d915d255 100644
--- 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
diff --git a/include/core/SkMultiPictureDraw.h b/include/core/SkMultiPictureDraw.h
index 8d24e615e8..cd46a303ae 100644
--- 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;
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index 6d01f8d162..f4c2abf939 100644
--- 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;
diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h
index 36e67e1de0..bd68c8fa72 100644
--- 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;
diff --git a/include/core/SkPathMeasure.h b/include/core/SkPathMeasure.h
index c8c0c5352b..ceea97f69a 100644
--- 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;
diff --git a/include/core/SkPathRef.h b/include/core/SkPathRef.h
index 3b24861f74..ce84a91d1a 100644
--- 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;
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index eccbe4b8e6..e1ce6d4c7f 100644
--- 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;
diff --git a/include/pathops/SkPathOps.h b/include/pathops/SkPathOps.h
index 18c7952f4a..fa01788394 100644
--- 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;
diff --git a/include/core/SkTDArray.h b/include/private/SkTDArray.h
index b5332a2cc4..b5332a2cc4 100644
--- a/include/core/SkTDArray.h
+++ b/include/private/SkTDArray.h
diff --git a/include/utils/SkLayer.h b/include/utils/SkLayer.h
index 7fdc6b2208..25bc32886e 100644
--- 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"
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index d25dbc9def..175701edbe 100644
--- 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:
diff --git a/include/utils/SkRTConf.h b/include/utils/SkRTConf.h
index 80a972c47b..c3e97ef5e3 100644
--- 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
diff --git a/include/views/SkOSMenu.h b/include/views/SkOSMenu.h
index 73254187ef..913b915387 100644
--- 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:
diff --git a/include/views/SkTouchGesture.h b/include/views/SkTouchGesture.h
index 3a0cfce18d..4a03065e25 100644
--- 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 {
diff --git a/include/views/SkWidget.h b/include/views/SkWidget.h
index 3c9363440b..a0a80d0a82 100644
--- 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"
diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h
index 850a7e7211..b4fabd253e 100644
--- 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;
diff --git a/include/xml/SkXMLWriter.h b/include/xml/SkXMLWriter.h
index 4c0935fc21..32901267de 100644
--- 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"
diff --git a/tools/flags/SkCommandLineFlags.h b/tools/flags/SkCommandLineFlags.h
index a2d3ba97e7..78919c1ec6 100644
--- 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
diff --git a/tools/skdiff.h b/tools/skdiff.h
index e508275eeb..eec5133eb3 100644
--- 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 "\\"
diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp
index bc8c3822fd..0dca407bf0 100644
--- 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 04:31:36 +0000