diff options
| -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/SkEndian.h (renamed from src/core/SkEndian.h) | 0 | ||||
| -rw-r--r-- | include/core/SkFloatBits.h (renamed from include/private/SkFloatBits.h) | 0 | ||||
| -rw-r--r-- | include/core/SkFloatingPoint.h (renamed from include/private/SkFloatingPoint.h) | 0 | ||||
| -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/core/SkWeakRefCnt.h (renamed from include/private/SkWeakRefCnt.h) | 0 | ||||
| -rw-r--r-- | include/svg/parser/SkSVGParser.h | 1 |
11 files changed, 8 insertions, 4 deletions
diff --git a/gyp/animator.gyp b/gyp/animator.gyp index 9eb076b164..e267756724 100644 --- a/gyp/animator.gyp +++ b/gyp/animator.gyp @@ -20,7 +20,6 @@ ], 'include_dirs': [ '../include/animator', - '../include/private', '../src/utils', ], 'sources': [ diff --git a/gyp/core.gypi b/gyp/core.gypi index fd9644eeec..d1ac89547f 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -273,10 +273,13 @@ '<(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', @@ -331,6 +334,7 @@ '<(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 c129570e6b..944857f5f0 100644 --- a/gyp/sfnt.gyp +++ b/gyp/sfnt.gyp @@ -13,7 +13,6 @@ 'core.gyp:*', ], 'include_dirs': [ - '../src/core', '../src/sfnt', ], 'sources': [ diff --git a/src/core/SkEndian.h b/include/core/SkEndian.h index 0955fcc505..0955fcc505 100644 --- a/src/core/SkEndian.h +++ b/include/core/SkEndian.h diff --git a/include/private/SkFloatBits.h b/include/core/SkFloatBits.h index 3ddb9ef564..3ddb9ef564 100644 --- a/include/private/SkFloatBits.h +++ b/include/core/SkFloatBits.h diff --git a/include/private/SkFloatingPoint.h b/include/core/SkFloatingPoint.h index f7ee816b12..f7ee816b12 100644 --- a/include/private/SkFloatingPoint.h +++ b/include/core/SkFloatingPoint.h diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index baef45ded0..358faf9524 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -9,6 +9,7 @@ #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 71575a4920..25d1c611cd 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -9,7 +9,7 @@ #define SkScalar_DEFINED #include "SkFixed.h" -#include "../private/SkFloatingPoint.h" +#include "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 863b8abac5..a9204a6df9 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 "../private/SkWeakRefCnt.h" +#include "SkWeakRefCnt.h" class SkDescriptor; class SkFontData; diff --git a/include/private/SkWeakRefCnt.h b/include/core/SkWeakRefCnt.h index a550951970..a550951970 100644 --- a/include/private/SkWeakRefCnt.h +++ b/include/core/SkWeakRefCnt.h diff --git a/include/svg/parser/SkSVGParser.h b/include/svg/parser/SkSVGParser.h index bb3ab90517..c2f9112e64 100644 --- a/include/svg/parser/SkSVGParser.h +++ b/include/svg/parser/SkSVGParser.h @@ -12,6 +12,7 @@ #include "SkMatrix.h" #include "SkTDict.h" +#include "SkTDStack.h" #include "SkSVGPaintState.h" #include "SkSVGTypes.h" #include "SkStream.h" |