diff options
| author |  reed <reed@chromium.org> | 2015-08-12 04:42:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-12 04:42:08 -0700 |
| commit | 9d20ee57d72a3850a6b51f2f2b00e00978be3864 (patch) | |
| tree | d3f577ea418bb1ce02574c8b36153adf86f613f1 | |
| parent | a387a11f9e10ee828fd0e0257cc3ee3f6262f7ca (diff) | |
Revert[2] "move some public headers into private"
This reverts commit 4cf9e7e14797f87f08b2078fa1afaf731cbf8f52.
BUG=skia:
TBR=
NOTRY=True
Review URL: https://codereview.chromium.org/1284173002
| -rw-r--r-- | gyp/animator.gyp | 1 | ||||
| -rw-r--r-- | gyp/core.gypi | 4 | ||||
| -rw-r--r-- | gyp/sfnt.gyp | 1 | ||||
| -rw-r--r-- | include/core/SkPicture.h | 1 | ||||
| -rw-r--r-- | include/core/SkScalar.h | 2 | ||||
| -rw-r--r-- | include/core/SkTypeface.h | 2 | ||||
| -rw-r--r-- | include/private/SkFloatBits.h (renamed from include/core/SkFloatBits.h) | 0 | ||||
| -rw-r--r-- | include/private/SkFloatingPoint.h (renamed from include/core/SkFloatingPoint.h) | 0 | ||||
| -rw-r--r-- | include/private/SkWeakRefCnt.h (renamed from include/core/SkWeakRefCnt.h) | 0 | ||||
| -rw-r--r-- | include/svg/parser/SkSVGParser.h | 1 | ||||
| -rw-r--r-- | src/core/SkEndian.h (renamed from include/core/SkEndian.h) | 0 |
11 files changed, 4 insertions, 8 deletions
diff --git a/gyp/animator.gyp b/gyp/animator.gyp index e267756724..9eb076b164 100644 --- a/gyp/animator.gyp +++ b/gyp/animator.gyp @@ -20,6 +20,7 @@ ], 'include_dirs': [ '../include/animator', + '../include/private', '../src/utils', ], 'sources': [ diff --git a/gyp/core.gypi b/gyp/core.gypi index d1ac89547f..fd9644eeec 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -273,13 +273,10 @@ '<(skia_include_path)/core/SkDrawable.h', '<(skia_include_path)/core/SkDrawFilter.h', '<(skia_include_path)/core/SkDrawLooper.h', - '<(skia_include_path)/core/SkEndian.h', '<(skia_include_path)/core/SkError.h', '<(skia_include_path)/core/SkFixed.h', '<(skia_include_path)/core/SkFlattenable.h', '<(skia_include_path)/core/SkFlattenableSerialization.h', - '<(skia_include_path)/core/SkFloatBits.h', - '<(skia_include_path)/core/SkFloatingPoint.h', '<(skia_include_path)/core/SkFontHost.h', '<(skia_include_path)/core/SkFontStyle.h', '<(skia_include_path)/core/SkGraphics.h', @@ -334,7 +331,6 @@ '<(skia_include_path)/core/SkTypes.h', '<(skia_include_path)/core/SkUnPreMultiply.h', '<(skia_include_path)/core/SkUtils.h', - '<(skia_include_path)/core/SkWeakRefCnt.h', '<(skia_include_path)/core/SkWriter32.h', '<(skia_include_path)/core/SkXfermode.h', diff --git a/gyp/sfnt.gyp b/gyp/sfnt.gyp index 944857f5f0..c129570e6b 100644 --- a/gyp/sfnt.gyp +++ b/gyp/sfnt.gyp @@ -13,6 +13,7 @@ 'core.gyp:*', ], 'include_dirs': [ + '../src/core', '../src/sfnt', ], 'sources': [ diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 358faf9524..baef45ded0 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -9,7 +9,6 @@ #define SkPicture_DEFINED #include "SkImageDecoder.h" -#include "SkLazyPtr.h" #include "SkRefCnt.h" #include "SkTypes.h" diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index 25d1c611cd..71575a4920 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -9,7 +9,7 @@ #define SkScalar_DEFINED #include "SkFixed.h" -#include "SkFloatingPoint.h" +#include "../private/SkFloatingPoint.h" // TODO: move this sort of check into SkPostConfig.h #define SK_SCALAR_IS_DOUBLE 0 diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index a9204a6df9..863b8abac5 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -14,7 +14,7 @@ #include "SkLazyPtr.h" #include "SkRect.h" #include "SkString.h" -#include "SkWeakRefCnt.h" +#include "../private/SkWeakRefCnt.h" class SkDescriptor; class SkFontData; diff --git a/include/core/SkFloatBits.h b/include/private/SkFloatBits.h index 3ddb9ef564..3ddb9ef564 100644 --- a/include/core/SkFloatBits.h +++ b/include/private/SkFloatBits.h diff --git a/include/core/SkFloatingPoint.h b/include/private/SkFloatingPoint.h index f7ee816b12..f7ee816b12 100644 --- a/include/core/SkFloatingPoint.h +++ b/include/private/SkFloatingPoint.h diff --git a/include/core/SkWeakRefCnt.h b/include/private/SkWeakRefCnt.h index a550951970..a550951970 100644 --- a/include/core/SkWeakRefCnt.h +++ b/include/private/SkWeakRefCnt.h diff --git a/include/svg/parser/SkSVGParser.h b/include/svg/parser/SkSVGParser.h index c2f9112e64..bb3ab90517 100644 --- a/include/svg/parser/SkSVGParser.h +++ b/include/svg/parser/SkSVGParser.h @@ -12,7 +12,6 @@ #include "SkMatrix.h" #include "SkTDict.h" -#include "SkTDStack.h" #include "SkSVGPaintState.h" #include "SkSVGTypes.h" #include "SkStream.h" diff --git a/include/core/SkEndian.h b/src/core/SkEndian.h index 0955fcc505..0955fcc505 100644 --- a/include/core/SkEndian.h +++ b/src/core/SkEndian.h |