diff options
author | 2018-02-06 23:05:36 +0000 | |
---|---|---|
committer | 2018-02-06 23:05:46 +0000 | |
commit | 5dd202dc9002ec7b42279b85ff89ba4780ad394d (patch) | |
tree | 9aa3c46943f599d97380acb19a3129717084563d /src | |
parent | 7a316f6fe3ef0de49d65d51c259a44edae401ce5 (diff) |
Revert "Revert "move GrColor.h to private, IWYU""
This reverts commit 63cc29304a65039feaf27842d587ed16de010b0d.
Reason for revert: pdfium updated
Original change's description:
> 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>
TBR=bsalomon@google.com,reed@google.com
Change-Id: I22fa5c0e0628b5c1f3b5f13879c7d1a4528cc93a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/104561
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkPixmap.cpp | 1 | ||||
-rw-r--r-- | src/core/SkUnPreMultiplyPriv.h | 1 | ||||
-rw-r--r-- | src/effects/SkBlurMask.cpp | 1 | ||||
-rw-r--r-- | src/effects/SkEmbossMaskFilter.cpp | 1 | ||||
-rw-r--r-- | src/gpu/GrBlend.cpp | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp index 7873a9b8ce..42e2c66029 100644 --- a/src/core/SkPixmap.cpp +++ b/src/core/SkPixmap.cpp @@ -19,6 +19,7 @@ #include "SkReadPixelsRec.h" #include "SkSurface.h" #include "SkTemplates.h" +#include "SkUnPreMultiply.h" #include "SkUtils.h" ///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkUnPreMultiplyPriv.h b/src/core/SkUnPreMultiplyPriv.h index 073e239ed7..f25e78f96a 100644 --- a/src/core/SkUnPreMultiplyPriv.h +++ b/src/core/SkUnPreMultiplyPriv.h @@ -9,6 +9,7 @@ #define SkUnPreMultiplyPriv_DEFINED #include "SkColor.h" +#include "SkUnPreMultiply.h" template <bool kSwapRB> void SkUnpremultiplyRow(uint32_t* dst, const uint32_t* src, int count) { diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp index f06e2b9f1e..59d70205c9 100644 --- a/src/effects/SkBlurMask.cpp +++ b/src/effects/SkBlurMask.cpp @@ -7,6 +7,7 @@ #include "SkBlurMask.h" +#include "SkColorPriv.h" #include "SkMaskBlurFilter.h" #include "SkMath.h" #include "SkTemplates.h" diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp index 4caef9ef0b..9fa26c5731 100644 --- a/src/effects/SkEmbossMaskFilter.cpp +++ b/src/effects/SkEmbossMaskFilter.cpp @@ -8,6 +8,7 @@ #include "SkEmbossMaskFilter.h" #include "SkBlurMaskFilter.h" #include "SkBlurMask.h" +#include "SkColorPriv.h" #include "SkEmbossMask.h" #include "SkReadBuffer.h" #include "SkWriteBuffer.h" diff --git a/src/gpu/GrBlend.cpp b/src/gpu/GrBlend.cpp index 1bb4dd3c9c..436829ce63 100644 --- a/src/gpu/GrBlend.cpp +++ b/src/gpu/GrBlend.cpp @@ -6,6 +6,7 @@ */ #include "GrBlend.h" +#include "../private/GrColor.h" /** * MaskedColor is used to evaluate the color and valid color component flags through the |