diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-02-06 18:33:15 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-06 18:33:26 +0000 |
| commit | 63cc29304a65039feaf27842d587ed16de010b0d (patch) | |
| tree | 98641fa8670811d30b2b616a9080ec6a3deb8dec /include | |
| parent | 929f75700936bfed556d34bd576731cbd0401ba3 (diff) | |
Revert "move GrColor.h to private, IWYU"
This reverts commit e602f395813aab8242afad356008b8e79911adbb.
Reason for revert: Breaks PDFIUM
Original change's description:
> move GrColor.h to private, IWYU
>
> Bug: skia:
> Change-Id: I0f0dabd7cc54cb7786f53bd6da0c0c012375037e
> Reviewed-on: https://skia-review.googlesource.com/104160
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,reed@google.com
Change-Id: Ifaa50f8771fa1ca8bc152270efdb1fe27f7210f2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/104440
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkImage.h | 1 | ||||
| -rw-r--r-- | include/core/SkShader.h | 2 | ||||
| -rw-r--r-- | include/gpu/GrBlend.h | 2 | ||||
| -rw-r--r-- | include/gpu/GrColor.h (renamed from include/private/GrColor.h) | 0 | ||||
| -rw-r--r-- | include/gpu/GrContext.h | 1 |
5 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 9e4e237db4..deb0313faf 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -8,7 +8,6 @@ #ifndef SkImage_DEFINED #define SkImage_DEFINED -#include "GrTypes.h" #include "SkFilterQuality.h" #include "SkImageInfo.h" #include "SkImageEncoder.h" diff --git a/include/core/SkShader.h b/include/core/SkShader.h index a5ba12ec2f..290d09fc87 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -9,11 +9,11 @@ #define SkShader_DEFINED #include "SkBlendMode.h" -#include "SkColor.h" #include "SkFilterQuality.h" #include "SkFlattenable.h" #include "SkImageInfo.h" #include "SkMatrix.h" +#include "../gpu/GrColor.h" class SkArenaAlloc; class SkBitmap; diff --git a/include/gpu/GrBlend.h b/include/gpu/GrBlend.h index 8c968f2d2e..30b0b9b6e0 100644 --- a/include/gpu/GrBlend.h +++ b/include/gpu/GrBlend.h @@ -9,7 +9,7 @@ #ifndef GrBlend_DEFINED #define GrBlend_DEFINED -#include "GrTypes.h" +#include "GrColor.h" #include "../private/SkTLogic.h" /** diff --git a/include/private/GrColor.h b/include/gpu/GrColor.h index b4a461d738..b4a461d738 100644 --- a/include/private/GrColor.h +++ b/include/gpu/GrColor.h diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index df9b85bacd..d0ca90e0f0 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -9,6 +9,7 @@ #define GrContext_DEFINED #include "GrCaps.h" +#include "GrColor.h" #include "SkMatrix.h" #include "SkPathEffect.h" #include "SkTypes.h" |