Revert "Move headers used by headers in include/ to include/private."

This reverts commit 928e16565f3e69cd6661e9ad300ac17e3f33c0c8.

BUG=skia:

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

31 files changed, 13 insertions, 37 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 04ed2e0607..5599c316c3 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -279,10 +279,8 @@ def _CheckLGTMsForPublicAPI(input_api, output_api):
     affected_file_path = affected_file.LocalPath()
     file_path, file_ext = os.path.splitext(affected_file_path)
     # We only care about files that end in .h and are under the top-level
-    # include dir, but not include/private.
-    if (file_ext == '.h' and
-        'include' == file_path.split(os.path.sep)[0] and
-        'private' not in file_path):
+    # include dir.
+    if file_ext == '.h' and 'include' == file_path.split(os.path.sep)[0]:
       requires_owner_check = True
 
   if not requires_owner_check:
@@ -330,12 +328,8 @@ def _CheckLGTMsForPublicAPI(input_api, output_api):
   if not lgtm_from_owner:
     results.append(
         output_api.PresubmitError(
-            "If this CL adds to or changes Skia's public API, you need an LGTM "
-            "from any of %s.  If this CL only removes from or doesn't change "
-            "Skia's public API, please add a short note to your CL saying so "
-            "and add one of those reviewers on a TBR= line.  If you don't know "
-            "this CL affects Skia's public API, please treat it like it does."
-            % str(PUBLIC_API_OWNERS)))
+            'Since the CL is editing public API, you must have an LGTM from '
+            'one of: %s' % str(PUBLIC_API_OWNERS)))
   return results
 
 
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index d0c0876948..7ccda93619 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -16,7 +16,6 @@
       'target_name': 'SampleApp',
       'type': 'executable',
       'include_dirs' : [
-        '../include/private',
         '../src/core',
         '../src/effects', #needed for BlurMask.h
         '../src/gpu', # needed by SkLua.cpp
diff --git a/gyp/bench.gypi b/gyp/bench.gypi
index e102a97f1b..a637202aa8 100644
--- a/gyp/bench.gypi
+++ b/gyp/bench.gypi
@@ -6,7 +6,6 @@
   'include_dirs': [
     '../bench/subset',
     '../bench',
-    '../include/private',
     '../src/core',
     '../src/effects',
     '../src/gpu',
diff --git a/gyp/core.gyp b/gyp/core.gyp
index 2569a9478f..ebf8786fed 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -23,7 +23,6 @@
         '../include/pathops',
         '../include/pipe',
         '../include/ports',
-        '../include/private',
         '../include/utils',
         '../include/images',
         '../src/core',
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index 83bbbf01c2..e9133901e6 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -82,7 +82,6 @@
         '/Library/Frameworks',
       ],
       'include_dirs' : [
-        '../include/private',
         '../src/core',
         '../src/utils/debugger',
         '../debugger',      # To pull SkDebugger.h
diff --git a/gyp/dm.gypi b/gyp/dm.gypi
index 9dd3228957..03a5ad36ea 100644
--- a/gyp/dm.gypi
+++ b/gyp/dm.gypi
@@ -7,7 +7,6 @@
   'include_dirs': [
     '../dm',
     '../gm',
-    '../include/private',
     '../src/core',
     '../src/effects',
     '../src/images',
diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index fa1bf537fd..154e5676c5 100644
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -20,7 +20,6 @@
       ],
       'include_dirs': [
         '../include/effects',
-        '../include/private',
         '../src/effects',
         '../src/opts',
         '../src/core',
diff --git a/gyp/example.gyp b/gyp/example.gyp
index 769e7309b0..a01717e67e 100644
--- a/gyp/example.gyp
+++ b/gyp/example.gyp
@@ -12,7 +12,6 @@
       'target_name': 'HelloWorld',
       'type': 'executable',
       'include_dirs' : [
-        '../include/private',
         '../include/gpu',
       ],
       'sources': [
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index bfd9d384dc..e49f706bb9 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -94,7 +94,6 @@
       ],
       'include_dirs': [
         '../include/gpu',
-        '../include/private',
         '../src/core',
         '../src/gpu',
         '../src/image/',
diff --git a/gyp/gputest.gyp b/gyp/gputest.gyp
index 6100363f46..868bc345f5 100644
--- a/gyp/gputest.gyp
+++ b/gyp/gputest.gyp
@@ -14,7 +14,6 @@
       ],
       'include_dirs': [
         '../include/gpu',
-        '../include/private',
         '../include/utils',
         '../src/core',
         '../src/gpu',
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 7efbb5ccf3..270cce5e02 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -19,7 +19,6 @@
         'pdf.gypi',
       ],
       'include_dirs': [
-        '../include/private',
         '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h
         '../src/pdf',
         '../src/utils', # needed to get SkBitSet.h
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index bfbd01c2df..a0cfbd64da 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -17,7 +17,6 @@
         '../include/effects',
         '../include/images',
         '../include/ports',
-        '../include/private',
         '../include/utils',
         '../include/utils/win',
         '../src/core',
diff --git a/gyp/svg.gyp b/gyp/svg.gyp
index ddcbb93511..df0c45cd0d 100644
--- a/gyp/svg.gyp
+++ b/gyp/svg.gyp
@@ -14,7 +14,6 @@
         'xml.gyp:*',
       ],
       'include_dirs': [
-        '../include/private',
         '../include/svg',
         '../src/core',
       ],
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 9b772be56c..855bfd748d 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -269,7 +269,6 @@
         '../tools/skpinfo.cpp',
       ],
       'include_dirs': [
-        '../include/private',
         '../src/core/',
       ],
       'dependencies': [
@@ -418,7 +417,6 @@
         '../tools/LazyDecodeBitmap.cpp',
       ],
       'include_dirs': [
-        '../include/private',
         '../src/core/',
         '../src/images',
         '../src/lazy',
@@ -578,7 +576,6 @@
       'target_name': 'filter',
       'type': 'executable',
       'include_dirs' : [
-        '../include/private',
         '../src/core',
         '../src/utils/debugger',
       ],
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 429984643b..3171d36a2b 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -22,7 +22,6 @@
         '../include/images',
         '../include/pathops',
         '../include/pipe',
-        '../include/private',
         '../include/utils',
         '../include/utils/mac',
         '../include/utils/unix',
diff --git a/gyp/utils.gypi b/gyp/utils.gypi
index 50f8ed618c..22f8652966 100644
--- a/gyp/utils.gypi
+++ b/gyp/utils.gypi
@@ -101,6 +101,7 @@
         '<(skia_src_path)/utils/SkThreadUtils_win.cpp',
         '<(skia_src_path)/utils/SkThreadUtils_win.h',
         '<(skia_src_path)/utils/SkTFitsIn.h',
+        '<(skia_src_path)/utils/SkTLogic.h',
 
         #mac
         '<(skia_include_path)/utils/mac/SkCGUtils.h',
diff --git a/gyp/views.gyp b/gyp/views.gyp
index 83ce377534..e7abc54aab 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -20,7 +20,6 @@
         'xml.gyp:xml',
       ],
       'include_dirs': [
-        '../include/private',
         '../include/views',
         '../include/views/unix',
         '../src/gpu',
diff --git a/gyp/visualbench.gyp b/gyp/visualbench.gyp
index 4900826a94..4bf559ae98 100644
--- a/gyp/visualbench.gyp
+++ b/gyp/visualbench.gyp
@@ -17,7 +17,6 @@
       'include_dirs' : [
         '../bench',
         '../include/gpu',
-        '../include/private',
         '../src/core',
         '../src/effects',
         '../src/images',
@@ -39,7 +38,7 @@
       'dependencies': [
         'etc1.gyp:libetc1',
         'flags.gyp:flags',
-        'gputest.gyp:skgputest',
+        'gputest.gyp:skgputest', 
         'skia_lib.gyp:skia_lib',
         'tools.gyp:proc_stats',
         'tools.gyp:sk_tool_utils',
@@ -58,7 +57,7 @@
               '-lGLESv2',
               '-lEGL',
             ],
-          },
+          },        
         }],
       ],
     },
diff --git a/gyp/xps.gyp b/gyp/xps.gyp
index d69880a2b1..454e065e16 100644
--- a/gyp/xps.gyp
+++ b/gyp/xps.gyp
@@ -16,7 +16,6 @@
             'skia_lib.gyp:skia_lib',
           ],
           'include_dirs': [
-            '../include/private',
             '../include/device/xps',
             '../include/utils/win',
             '../src/core', # needed to get SkGlyphCache.h
diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h
index 2ac83880c0..811d02a36e 100644
--- a/include/core/SkPictureRecorder.h
+++ b/include/core/SkPictureRecorder.h
@@ -8,7 +8,7 @@
 #ifndef SkPictureRecorder_DEFINED
 #define SkPictureRecorder_DEFINED
 
-#include "../private/SkMiniRecorder.h"
+#include "../../src/core/SkMiniRecorder.h"
 #include "SkBBHFactory.h"
 #include "SkPicture.h"
 #include "SkRefCnt.h"
diff --git a/include/gpu/GrBlend.h b/include/gpu/GrBlend.h
index 52a0300ee4..c8b931da73 100644
--- a/include/gpu/GrBlend.h
+++ b/include/gpu/GrBlend.h
@@ -7,7 +7,7 @@
  */
 
 #include "GrTypes.h"
-#include "../private/SkTLogic.h"
+#include "../../src/utils/SkTLogic.h"
 
 #ifndef GrBlend_DEFINED
 #define GrBlend_DEFINED
diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h
index f9b32276e4..3d232e558e 100644
--- a/include/gpu/gl/SkGLContext.h
+++ b/include/gpu/gl/SkGLContext.h
@@ -9,7 +9,7 @@
 #define SkGLContext_DEFINED
 
 #include "GrGLInterface.h"
-#include "../../private/SkGpuFenceSync.h"
+#include "../../src/gpu/SkGpuFenceSync.h"
 
 /**
  * Create an offscreen opengl context with an RGBA8 / 8bit stencil FBO.
@@ -18,7 +18,7 @@
 
 class SK_API SkGLContext : public SkRefCnt {
 public:
-
+    
 
     ~SkGLContext() override;
 
diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h
index c917438438..e7bba18205 100644
--- a/include/views/SkOSWindow_Win.h
+++ b/include/views/SkOSWindow_Win.h
@@ -11,8 +11,8 @@
 #define SkOSWindow_Win_DEFINED
 
 #include "SkWindow.h"
-#include "../private/SkFunction.h"
-#include "../private/SkTHash.h"
+#include "../../src/core/SkFunction.h"
+#include "../../src/core/SkTHash.h"
 
 #if SK_ANGLE
 #include "EGL/egl.h"
diff --git a/include/private/SkChecksum.h b/src/core/SkChecksum.h
index 8eb1766ec0..8eb1766ec0 100644
--- a/include/private/SkChecksum.h
+++ b/src/core/SkChecksum.h
diff --git a/include/private/SkFunction.h b/src/core/SkFunction.h
index 429c6f5ade..429c6f5ade 100644
--- a/include/private/SkFunction.h
+++ b/src/core/SkFunction.h
diff --git a/include/private/SkMiniRecorder.h b/src/core/SkMiniRecorder.h
index 914eccc2e3..914eccc2e3 100644
--- a/include/private/SkMiniRecorder.h
+++ b/src/core/SkMiniRecorder.h
diff --git a/include/private/SkPathPriv.h b/src/core/SkPathPriv.h
index 934c730660..934c730660 100644
--- a/include/private/SkPathPriv.h
+++ b/src/core/SkPathPriv.h
diff --git a/include/private/SkRecords.h b/src/core/SkRecords.h
index 4c9833cfc0..4c9833cfc0 100644
--- a/include/private/SkRecords.h
+++ b/src/core/SkRecords.h
diff --git a/include/private/SkTHash.h b/src/core/SkTHash.h
index ffcdea5329..ffcdea5329 100644
--- a/include/private/SkTHash.h
+++ b/src/core/SkTHash.h
diff --git a/include/private/SkGpuFenceSync.h b/src/gpu/SkGpuFenceSync.h
index b78398fed8..b78398fed8 100644
--- a/include/private/SkGpuFenceSync.h
+++ b/src/gpu/SkGpuFenceSync.h
diff --git a/include/private/SkTLogic.h b/src/utils/SkTLogic.h
index d188242446..d188242446 100644
--- a/include/private/SkTLogic.h
+++ b/src/utils/SkTLogic.h