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>
diff --git a/modules/skottie/src/effects/TintEffect.cpp b/modules/skottie/src/effects/TintEffect.cpp
index f43fe58..69073af 100644
--- a/modules/skottie/src/effects/TintEffect.cpp
+++ b/modules/skottie/src/effects/TintEffect.cpp
@@ -8,8 +8,8 @@
#include "modules/skottie/src/effects/Effects.h"
#include "modules/skottie/src/SkottieValue.h"
-#include "modules/sksg/include/SkSGPaint.h"
#include "modules/sksg/include/SkSGColorFilter.h"
+#include "modules/sksg/include/SkSGPaint.h"
#include "src/utils/SkJSON.h"
namespace skottie {
diff --git a/modules/skparagraph/include/FontCollection.h b/modules/skparagraph/include/FontCollection.h
index b678547..8472b7e 100644
--- a/modules/skparagraph/include/FontCollection.h
+++ b/modules/skparagraph/include/FontCollection.h
@@ -4,10 +4,10 @@
#include <memory>
#include <set>
-#include "modules/skparagraph/include/TextStyle.h"
#include "include/core/SkFontMgr.h"
#include "include/core/SkRefCnt.h"
#include "include/private/SkTHash.h"
+#include "modules/skparagraph/include/TextStyle.h"
namespace skia {
namespace textlayout {
diff --git a/modules/skparagraph/include/ParagraphStyle.h b/modules/skparagraph/include/ParagraphStyle.h
index 55ce1aa..679a2dd 100644
--- a/modules/skparagraph/include/ParagraphStyle.h
+++ b/modules/skparagraph/include/ParagraphStyle.h
@@ -2,9 +2,9 @@
#ifndef ParagraphStyle_DEFINED
#define ParagraphStyle_DEFINED
+#include "include/core/SkFontStyle.h"
#include "modules/skparagraph/include/DartTypes.h"
#include "modules/skparagraph/include/TextStyle.h"
-#include "include/core/SkFontStyle.h"
namespace skia {
namespace textlayout {
diff --git a/modules/skparagraph/include/TextStyle.h b/modules/skparagraph/include/TextStyle.h
index 9fad675..500b88b 100644
--- a/modules/skparagraph/include/TextStyle.h
+++ b/modules/skparagraph/include/TextStyle.h
@@ -3,13 +3,13 @@
#define TextStyle_DEFINED
#include <vector>
-#include "modules/skparagraph/include/DartTypes.h"
-#include "modules/skparagraph/include/TextShadow.h"
#include "include/core/SkColor.h"
#include "include/core/SkFont.h"
#include "include/core/SkFontMetrics.h"
#include "include/core/SkFontStyle.h"
#include "include/core/SkPaint.h"
+#include "modules/skparagraph/include/DartTypes.h"
+#include "modules/skparagraph/include/TextShadow.h"
// TODO: Make it external so the other platforms (Android) could use it
#define DEFAULT_FONT_FAMILY "sans-serif"
diff --git a/modules/skparagraph/src/FontIterator.h b/modules/skparagraph/src/FontIterator.h
index 68858ec..9848258 100644
--- a/modules/skparagraph/src/FontIterator.h
+++ b/modules/skparagraph/src/FontIterator.h
@@ -4,11 +4,11 @@
#include <unicode/brkiter.h>
#include <unicode/ubidi.h>
-#include "modules/skparagraph/src/ParagraphImpl.h"
#include "include/core/SkBlurTypes.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkFontMgr.h"
#include "include/core/SkPictureRecorder.h"
+#include "modules/skparagraph/src/ParagraphImpl.h"
#include "src/core/SkSpan.h"
#include "src/utils/SkUTF.h"
diff --git a/modules/skparagraph/src/ParagraphBuilderImpl.cpp b/modules/skparagraph/src/ParagraphBuilderImpl.cpp
index 0a97527..9ef730d 100644
--- a/modules/skparagraph/src/ParagraphBuilderImpl.cpp
+++ b/modules/skparagraph/src/ParagraphBuilderImpl.cpp
@@ -1,7 +1,7 @@
// Copyright 2019 Google LLC.
-#include "modules/skparagraph/src/ParagraphBuilderImpl.h"
#include "include/core/SkPaint.h"
#include "modules/skparagraph/include/ParagraphStyle.h"
+#include "modules/skparagraph/src/ParagraphBuilderImpl.h"
#include "modules/skparagraph/src/ParagraphImpl.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkSpan.h"
diff --git a/modules/skparagraph/src/ParagraphImpl.h b/modules/skparagraph/src/ParagraphImpl.h
index fca49ee..ab960e0 100644
--- a/modules/skparagraph/src/ParagraphImpl.h
+++ b/modules/skparagraph/src/ParagraphImpl.h
@@ -2,13 +2,13 @@
#ifndef ParagraphImpl_DEFINED
#define ParagraphImpl_DEFINED
-#include "modules/skparagraph/src/TextLine.h"
-#include "modules/skparagraph/src/Run.h"
#include "include/core/SkPicture.h"
-#include "include/private//SkTHash.h"
+#include "include/private/SkTHash.h"
#include "modules/skparagraph/include/Paragraph.h"
#include "modules/skparagraph/include/ParagraphStyle.h"
#include "modules/skparagraph/include/TextStyle.h"
+#include "modules/skparagraph/src/Run.h"
+#include "modules/skparagraph/src/TextLine.h"
class SkCanvas;
diff --git a/modules/skparagraph/src/TextLine.h b/modules/skparagraph/src/TextLine.h
index de71e38..0082f45 100644
--- a/modules/skparagraph/src/TextLine.h
+++ b/modules/skparagraph/src/TextLine.h
@@ -2,12 +2,12 @@
#ifndef TextLine_DEFINED
#define TextLine_DEFINED
-#include "modules/skparagraph/src/Run.h"
#include "include/core/SkCanvas.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTHash.h"
#include "modules/skparagraph/include/DartTypes.h"
#include "modules/skparagraph/include/TextStyle.h"
+#include "modules/skparagraph/src/Run.h"
#include "src/core/SkSpan.h"
namespace skia {
diff --git a/modules/skparagraph/src/TextShadow.cpp b/modules/skparagraph/src/TextShadow.cpp
index 00ef8f2..6df35f4 100644
--- a/modules/skparagraph/src/TextShadow.cpp
+++ b/modules/skparagraph/src/TextShadow.cpp
@@ -1,6 +1,6 @@
// Copyright 2019 Google LLC.
-#include "modules/skparagraph/include/TextShadow.h"
#include "include/core/SkColor.h"
+#include "modules/skparagraph/include/TextShadow.h"
namespace skia {
namespace textlayout {
diff --git a/modules/skparagraph/src/TextStyle.cpp b/modules/skparagraph/src/TextStyle.cpp
index 8ba3d2d..85a387b 100644
--- a/modules/skparagraph/src/TextStyle.cpp
+++ b/modules/skparagraph/src/TextStyle.cpp
@@ -1,7 +1,7 @@
// Copyright 2019 Google LLC.
-#include "modules/skparagraph/include/TextStyle.h"
#include "include/core/SkColor.h"
#include "include/core/SkFontStyle.h"
+#include "modules/skparagraph/include/TextStyle.h"
namespace skia {
namespace textlayout {
diff --git a/modules/skparagraph/src/TextWrapper.cpp b/modules/skparagraph/src/TextWrapper.cpp
index f8adfd1..87a9835 100644
--- a/modules/skparagraph/src/TextWrapper.cpp
+++ b/modules/skparagraph/src/TextWrapper.cpp
@@ -1,6 +1,6 @@
// Copyright 2019 Google LLC.
-#include "modules/skparagraph/src/TextWrapper.h"
#include "modules/skparagraph/src/ParagraphImpl.h"
+#include "modules/skparagraph/src/TextWrapper.h"
namespace skia {
namespace textlayout {