From e02716908fe82c7c4ae9b415793277620a22bcd6 Mon Sep 17 00:00:00 2001
From: reed <reed@chromium.org>
Date: Sat, 15 Aug 2015 07:28:34 -0700
Subject: [PATCH] Revert[6] "move some public headers into private"

This reverts commit cc1229c9d5e57b45305ba8f99ae33e92db0032bc.

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1295003002
---
 gyp/animator.gyp                            | 1 +
 gyp/core.gypi                               | 4 ----
 gyp/sfnt.gyp                                | 1 +
 include/core/SkPicture.h                    | 1 -
 include/core/SkScalar.h                     | 2 +-
 include/core/SkTypeface.h                   | 2 +-
 include/{core => private}/SkFloatBits.h     | 0
 include/{core => private}/SkFloatingPoint.h | 0
 include/{core => private}/SkWeakRefCnt.h    | 0
 include/svg/parser/SkSVGParser.h            | 1 -
 {include => src}/core/SkEndian.h            | 0
 11 files changed, 4 insertions(+), 8 deletions(-)
 rename include/{core => private}/SkFloatBits.h (100%)
 rename include/{core => private}/SkFloatingPoint.h (100%)
 rename include/{core => private}/SkWeakRefCnt.h (100%)
 rename {include => src}/core/SkEndian.h (100%)

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 26e8f70b6f..dd322ce8e0 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -274,13 +274,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',
@@ -335,7 +332,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
similarity index 100%
rename from include/core/SkFloatBits.h
rename to include/private/SkFloatBits.h
diff --git a/include/core/SkFloatingPoint.h b/include/private/SkFloatingPoint.h
similarity index 100%
rename from include/core/SkFloatingPoint.h
rename to include/private/SkFloatingPoint.h
diff --git a/include/core/SkWeakRefCnt.h b/include/private/SkWeakRefCnt.h
similarity index 100%
rename from include/core/SkWeakRefCnt.h
rename to 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
similarity index 100%
rename from include/core/SkEndian.h
rename to src/core/SkEndian.h