Revert[3] "move some public headers into private"

This reverts commit 9d20ee57d7.

BUG=skia:
TBR=

failures here: https://codereview.chromium.org/1286103004

Review URL: https://codereview.chromium.org/1290733002

gyp/animator.gyp

@@ -20,7 +20,6 @@
       ],
       'include_dirs': [
         '../include/animator',
-        '../include/private',
         '../src/utils',
       ],
       'sources': [

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',
 

gyp/sfnt.gyp

@@ -13,7 +13,6 @@
         'core.gyp:*',
       ],
       'include_dirs': [
-        '../src/core',
         '../src/sfnt',
       ],
       'sources': [

include/core/SkPicture.h

@@ -9,6 +9,7 @@
 #define SkPicture_DEFINED
 
 #include "SkImageDecoder.h"
+#include "SkLazyPtr.h"
 #include "SkRefCnt.h"
 #include "SkTypes.h"
 

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

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;

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"