From 76a834a107af38fb2e85413bc7a46e555c444a85 Mon Sep 17 00:00:00 2001 From: reed Date: Sun, 3 Jan 2016 18:36:05 -0800 Subject: [PATCH] move SkTDict and SkTSearch into private BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1558923002 TBR= Review URL: https://codereview.chromium.org/1558923002 --- gyp/core.gypi | 4 ++-- include/{core => private}/SkTDict.h | 0 include/{core => private}/SkTSearch.h | 0 include/svg/parser/SkSVGParser.h | 2 +- include/utils/SkRTConf.h | 5 ++--- include/views/SkView.h | 2 +- include/views/SkViewInflate.h | 2 +- tools/skdiff_main.cpp | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) rename include/{core => private}/SkTDict.h (100%) rename include/{core => private}/SkTSearch.h (100%) diff --git a/gyp/core.gypi b/gyp/core.gypi index 6446fe1d0c..050477cd73 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -379,10 +379,8 @@ '<(skia_include_path)/core/SkTArray.h', '<(skia_include_path)/core/SkTDArray.h', '<(skia_include_path)/core/SkTDStack.h', - '<(skia_include_path)/core/SkTDict.h', '<(skia_include_path)/core/SkTInternalLList.h', '<(skia_include_path)/core/SkTRegistry.h', - '<(skia_include_path)/core/SkTSearch.h', '<(skia_include_path)/core/SkTextBlob.h', '<(skia_include_path)/core/SkTime.h', '<(skia_include_path)/core/SkTLazy.h', @@ -409,6 +407,8 @@ '<(skia_include_path)/private/SkTemplates.h', '<(skia_include_path)/private/SkTHash.h', '<(skia_include_path)/private/SkThreadID.h', + '<(skia_include_path)/private/SkTDict.h', + '<(skia_include_path)/private/SkTSearch.h', '<(skia_include_path)/private/SkTLogic.h', '<(skia_include_path)/private/SkUniquePtr.h', '<(skia_include_path)/private/SkUtility.h', diff --git a/include/core/SkTDict.h b/include/private/SkTDict.h similarity index 100% rename from include/core/SkTDict.h rename to include/private/SkTDict.h diff --git a/include/core/SkTSearch.h b/include/private/SkTSearch.h similarity index 100% rename from include/core/SkTSearch.h rename to include/private/SkTSearch.h diff --git a/include/svg/parser/SkSVGParser.h b/include/svg/parser/SkSVGParser.h index bb3ab90517..9a5c4157b1 100644 --- a/include/svg/parser/SkSVGParser.h +++ b/include/svg/parser/SkSVGParser.h @@ -11,7 +11,7 @@ #define SkSVGParser_DEFINED #include "SkMatrix.h" -#include "SkTDict.h" +#include "../private/SkTDict.h" #include "SkSVGPaintState.h" #include "SkSVGTypes.h" #include "SkStream.h" diff --git a/include/utils/SkRTConf.h b/include/utils/SkRTConf.h index dc95cdbadb..6c7963c64e 100644 --- a/include/utils/SkRTConf.h +++ b/include/utils/SkRTConf.h @@ -9,11 +9,10 @@ #ifndef SkRTConf_DEFINED #define SkRTConf_DEFINED +#include "SkTArray.h" #include "SkString.h" #include "SkStream.h" - -#include "SkTDict.h" -#include "SkTArray.h" +#include "../private/SkTDict.h" /** \class SkRTConfBase Non-templated base class for the runtime configs diff --git a/include/views/SkView.h b/include/views/SkView.h index e099e0d405..17eb3800f4 100644 --- a/include/views/SkView.h +++ b/include/views/SkView.h @@ -13,7 +13,7 @@ #include "SkEventSink.h" #include "SkRect.h" #include "SkDOM.h" -#include "SkTDict.h" +#include "../private/SkTDict.h" #include "SkMatrix.h" #include "SkMetaData.h" diff --git a/include/views/SkViewInflate.h b/include/views/SkViewInflate.h index db3689a827..4ec36a67df 100644 --- a/include/views/SkViewInflate.h +++ b/include/views/SkViewInflate.h @@ -11,7 +11,7 @@ #define SkViewInflate_DEFINED #include "SkDOM.h" -#include "SkTDict.h" +#include "../private/SkTDict.h" #include "SkEvent.h" class SkView; diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp index 00bcdfcda0..bc8c3822fd 100644 --- a/tools/skdiff_main.cpp +++ b/tools/skdiff_main.cpp @@ -15,7 +15,7 @@ #include "SkOSFile.h" #include "SkStream.h" #include "SkTDArray.h" -#include "SkTSearch.h" +#include "../private/SkTSearch.h" #include -- 2.34.1