diff options
author | Mike Reed <reed@google.com> | 2017-02-15 19:15:55 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-15 19:16:08 +0000 |
commit | c24447dc49d88622224b54ccd56a17d544dca22d (patch) | |
tree | 9c34158537364d97058dfe5d10360b8c1818fd48 | |
parent | e14d3053f329c97e1bd0519e9b358a887988dcb8 (diff) |
Revert "Revert "make SkClipStack.h private (in src)""
This reverts commit 1c8e82b72bfeb1a02297688cf082c365b62705f7.
Reason for revert: previous reason to revert fixed. relanding.
Original change's description:
> Revert "make SkClipStack.h private (in src)"
>
> This reverts commit 3efca0a2a8fc412a318199fa386c1375b55ee81e.
>
> Reason for revert: update caller in GraphicsContext.cpp
>
> Original change's description:
> > make SkClipStack.h private (in src)
> >
> > BUG=skia:
> >
> > Change-Id: I05f1140fe483f4a92093cb9783c6e9f067420d30
> > Reviewed-on: https://skia-review.googlesource.com/8481
> > Reviewed-by: Florin Malita <fmalita@chromium.org>
> > Commit-Queue: Mike Reed <reed@google.com>
> >
>
> TBR=fmalita@chromium.org,reed@google.com,reviews@skia.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Change-Id: Iff1138d72ff2d1187d522487fe76ea293f706f60
> Reviewed-on: https://skia-review.googlesource.com/8501
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
>
TBR=reviews@skia.org,fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: If7e54653c00a0c57ffa60b0c9f40dd0ffad2fe42
Reviewed-on: https://skia-review.googlesource.com/8522
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
-rw-r--r-- | gn/core.gni | 2 | ||||
-rw-r--r-- | src/core/SkClipStack.h (renamed from include/core/SkClipStack.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gn/core.gni b/gn/core.gni index d70291939b..bc6035be9d 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -68,6 +68,7 @@ skia_core_sources = [ "$_src/core/SkCanvasPriv.h", "$_src/core/SkChunkAlloc.cpp", "$_src/core/SkClipStack.cpp", + "$_src/core/SkClipStack.h", "$_src/core/SkColor.cpp", "$_src/core/SkColorFilter.cpp", "$_src/core/SkColorFilterShader.cpp", @@ -383,7 +384,6 @@ skia_core_sources = [ "$_include/core/SkBBHFactory.h", "$_include/core/SkBitmap.h", "$_include/core/SkCanvas.h", - "$_include/core/SkClipStack.h", "$_include/core/SkColor.h", "$_include/core/SkColorFilter.h", "$_include/core/SkColorPriv.h", diff --git a/include/core/SkClipStack.h b/src/core/SkClipStack.h index 2f24d69502..2f24d69502 100644 --- a/include/core/SkClipStack.h +++ b/src/core/SkClipStack.h |