commit f91aeb259e095bf8c942063f7f2525fef2d5020c
author Greg Daniel <egdaniel@google.com> Tue Jun 18 09:58:02 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 18 14:24:42 2019 +0000
tree 7781e32a7cf7eda8deabdf543443678dba847cc6
parent 07edcfd4dc1962921de1775fd506e04e27f98642

Move a bunch of gpu files out of include/private and into src/gpu.

In GrRecordingContext I moved the auditTrail onto the heap and only there
when compiling for tests. This allowed us to move a lot of files out of
include private.

Change-Id: Ib76ac211c0c6fd10bacaccf0c5f93f21a59f35d5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221344
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Auto-Submit: Greg Daniel <egdaniel@google.com>

src/gpu/text/GrAtlasManager.cpp

diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index d736478..be5d05c 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -68,10 +68,10 @@
 }
 
 #ifdef SK_DEBUG
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
 
 #include "include/core/SkBitmap.h"
 #include "include/core/SkImageEncoder.h"

src/gpu/text/GrStrikeCache.cpp

diff --git a/src/gpu/text/GrStrikeCache.cpp b/src/gpu/text/GrStrikeCache.cpp
index 1569146..211e73a 100644
--- a/src/gpu/text/GrStrikeCache.cpp
+++ b/src/gpu/text/GrStrikeCache.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "include/private/GrColor.h"
 #include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
 #include "src/gpu/GrDistanceFieldGenFromVector.h"
 #include "src/gpu/text/GrAtlasManager.h"
 #include "src/gpu/text/GrStrikeCache.h"

src/gpu/text/GrTextBlob.h

diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 5bd633c..81d6d65 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -11,7 +11,6 @@
 #include "include/core/SkPathEffect.h"
 #include "include/core/SkPoint3.h"
 #include "include/core/SkSurfaceProps.h"
-#include "include/private/GrColor.h"
 #include "src/core/SkDescriptor.h"
 #include "src/core/SkMaskFilterBase.h"
 #include "src/core/SkOpts.h"
@@ -19,6 +18,7 @@
 #include "src/core/SkStrikeCache.h"
 #include "src/core/SkStrikeSpec.h"
 #include "src/core/SkTInternalLList.h"
+#include "src/gpu/GrColor.h"
 #include "src/gpu/GrDrawOpAtlas.h"
 #include "src/gpu/text/GrStrikeCache.h"
 #include "src/gpu/text/GrTextContext.h"