commit 4d1700125c33c6629b79d7d60da306a3a264cacd
author Mike Reed <reed@google.com> Mon Feb 17 16:51:14 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 18 02:05:08 2020 +0000
tree 683bbe923b69cdfb65c1cfbb99cab8ba23234cb2
parent 3c4f3c178adeeb23463476ac47994536304f9fa9

move SkDeque.h into private

Perhaps just make this SkTStack...

Change-Id: Iefdbb1e33acec96aec5f885e3e16ac2d97fd5f73
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/271320
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

gn/core.gni

diff --git a/gn/core.gni b/gn/core.gni
index 743ea25..dff7111 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -26,7 +26,6 @@
   "$_include/core/SkData.h",
   "$_include/core/SkDataTable.h",
   "$_include/core/SkDeferredDisplayListRecorder.h",
-  "$_include/core/SkDeque.h",
   "$_include/core/SkDocument.h",
   "$_include/core/SkDrawLooper.h",
   "$_include/core/SkDrawable.h",
@@ -462,6 +461,7 @@
   "$_include/private/SkChecksum.h",
   "$_include/private/SkColorData.h",
   "$_include/private/SkDeferredDisplayList.h",
+  "$_include/private/SkDeque.h",
   "$_include/private/SkFixed.h",
   "$_include/private/SkFloatBits.h",
   "$_include/private/SkFloatingPoint.h",

include/atlastext/SkAtlasTextTarget.h

diff --git a/include/atlastext/SkAtlasTextTarget.h b/include/atlastext/SkAtlasTextTarget.h
index b90dad6..ca8eca7 100644
--- a/include/atlastext/SkAtlasTextTarget.h
+++ b/include/atlastext/SkAtlasTextTarget.h
@@ -8,9 +8,9 @@
 #ifndef SkAtlasTextTarget_DEFINED
 #define SkAtlasTextTarget_DEFINED
 
-#include "include/core/SkDeque.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/private/SkDeque.h"
 
 #include <memory>
 

include/core/SkCanvas.h

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 8b5d561..9e66747 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -11,7 +11,6 @@
 #include "include/core/SkBlendMode.h"
 #include "include/core/SkClipOp.h"
 #include "include/core/SkColor.h"
-#include "include/core/SkDeque.h"
 #include "include/core/SkFontTypes.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkMatrix.h"
@@ -26,6 +25,7 @@
 #include "include/core/SkSurfaceProps.h"
 #include "include/core/SkTypes.h"
 #include "include/core/SkVertices.h"
+#include "include/private/SkDeque.h"
 #include "include/private/SkM44.h"
 #include "include/private/SkMacros.h"
 

include/private/SkDeque.h

diff --git a/include/core/SkDeque.h b/include/private/SkDeque.h
similarity index 100%
rename from include/core/SkDeque.h
rename to include/private/SkDeque.h

src/core/SkClipStack.h

diff --git a/src/core/SkClipStack.h b/src/core/SkClipStack.h
index 2bba42f..6a12c2f 100644
--- a/src/core/SkClipStack.h
+++ b/src/core/SkClipStack.h
@@ -9,11 +9,11 @@
 #define SkClipStack_DEFINED
 
 #include "include/core/SkCanvas.h"
-#include "include/core/SkDeque.h"
 #include "include/core/SkPath.h"
 #include "include/core/SkRRect.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRegion.h"
+#include "include/private/SkDeque.h"
 #include "src/core/SkClipOpPriv.h"
 #include "src/core/SkMessageBus.h"
 #include "src/core/SkTLazy.h"

src/core/SkDeque.cpp

diff --git a/src/core/SkDeque.cpp b/src/core/SkDeque.cpp
index 6df4cc0..a9501af 100644
--- a/src/core/SkDeque.cpp
+++ b/src/core/SkDeque.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "include/core/SkDeque.h"
+#include "include/private/SkDeque.h"
 #include "include/private/SkMalloc.h"
 
 struct SkDeque::Block {

src/core/SkRasterClipStack.h

diff --git a/src/core/SkRasterClipStack.h b/src/core/SkRasterClipStack.h
index 3698e25..38a3da7 100644
--- a/src/core/SkRasterClipStack.h
+++ b/src/core/SkRasterClipStack.h
@@ -9,7 +9,7 @@
 #define SkRasterClipStack_DEFINED
 
 #include "include/core/SkClipOp.h"
-#include "include/core/SkDeque.h"
+#include "include/private/SkDeque.h"
 #include "src/core/SkRasterClip.h"
 #include <new>
 

tests/DequeTest.cpp

diff --git a/tests/DequeTest.cpp b/tests/DequeTest.cpp
index b3e4515..c93a812 100644
--- a/tests/DequeTest.cpp
+++ b/tests/DequeTest.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "include/core/SkDeque.h"
+#include "include/private/SkDeque.h"
 #include "tests/Test.h"
 
 static void assert_count(skiatest::Reporter* reporter, const SkDeque& deq, int count) {