diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-05-31 12:43:27 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-31 17:27:43 +0000 |
| commit | 774168efac172d096cd7f09841bce51650cb6e84 (patch) | |
| tree | 1433b93978baaf92439289fe5a0a3e648a73974f /gn | |
| parent | e304a8a21b0bc40c3a7d85a96371a21180750076 (diff) | |
Allow CCPR in DDL mode (take 2)
A lot of the changes to get this compiling on the
win_chromium_compile_dbg_ng bot (i.e., moving a lot of header files to
private) should be undone if that bot is ever "fixed".
Bug: skia:7988
Change-Id: I704ff793d80b18e7312048538874498824803580
Reviewed-on: https://skia-review.googlesource.com/130920
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/core.gni | 4 | ||||
| -rw-r--r-- | gn/gpu.gni | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gn/core.gni b/gn/core.gni index 1d89a1c6f7..56b335cf0a 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -135,7 +135,6 @@ skia_core_sources = [ "$_src/core/SkFDot6.h", "$_src/core/SkFindAndPlaceGlyph.h", "$_src/core/SkArenaAlloc.cpp", - "$_src/core/SkArenaAlloc.h", "$_src/core/SkArenaAllocList.h", "$_src/core/SkGaussFilter.cpp", "$_src/core/SkGaussFilter.h", @@ -310,7 +309,6 @@ skia_core_sources = [ "$_src/core/SkTaskGroup2D.h", "$_src/core/SkTDPQueue.h", "$_src/core/SkTDynamicHash.h", - "$_src/core/SkTInternalLList.h", "$_src/core/SkTextBlob.cpp", "$_src/core/SkTextBlobRunIterator.h", "$_src/core/SkTextFormatParams.h", @@ -448,6 +446,7 @@ skia_core_sources = [ "$_src/jumper/SkJumper.cpp", # private + "$_include/private/SkArenaAlloc.h", "$_include/private/SkAtomics.h", "$_include/private/SkChecksum.h", "$_include/private/SkDeferredDisplayList.h", @@ -467,6 +466,7 @@ skia_core_sources = [ "$_include/private/SkTDArray.h", "$_include/private/SkTFitsIn.h", "$_include/private/SkTHash.h", + "$_include/private/SkTInternalLList.h", "$_include/private/SkThreadID.h", "$_include/private/SkTSearch.h", "$_include/private/SkTLogic.h", diff --git a/gn/gpu.gni b/gn/gpu.gni index d0e7f7f150..110667d986 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -33,6 +33,8 @@ skia_gpu_sources = [ # Private includes "$_include/private/GrAuditTrail.h", "$_include/private/GrColor.h", + "$_include/private/GrCCClipPath.h", + "$_include/private/GrCCPerOpListPaths.h", "$_include/private/GrGLSL.h", "$_include/private/GrOpList.h", "$_include/private/GrSingleOwner.h", @@ -302,7 +304,6 @@ skia_gpu_sources = [ "$_src/gpu/ccpr/GrCCAtlas.cpp", "$_src/gpu/ccpr/GrCCAtlas.h", "$_src/gpu/ccpr/GrCCClipPath.cpp", - "$_src/gpu/ccpr/GrCCClipPath.h", "$_src/gpu/ccpr/GrCCClipProcessor.cpp", "$_src/gpu/ccpr/GrCCClipProcessor.h", "$_src/gpu/ccpr/GrCCConicShader.cpp", |