diff options
| author |  Brian Osman <brianosman@google.com> | 2017-03-07 16:58:08 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-08 20:55:21 +0000 |
| commit | 3b65598bceb65736486db27ed49a56d787032747 (patch) | |
| tree | dd52a8a485d767167f845ef97d40ae2d8ea70997 /tests | |
| parent | 41eac798f8ae5bb0fd3af3c16390d75501259f8d (diff) | |
Make SkGr.h private and remove unused functions
BUG=skia:
Change-Id: I6699d00c5412ed9d9bf14b032a08b06b1c766bce
Reviewed-on: https://skia-review.googlesource.com/9398
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GrGetCoeffBlendKnownComponentsTest.cpp | 11 | ||||
| -rw-r--r-- | tests/SpecialImageTest.cpp | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/tests/GrGetCoeffBlendKnownComponentsTest.cpp b/tests/GrGetCoeffBlendKnownComponentsTest.cpp index 31a41943d9..53bd09e251 100644 --- a/tests/GrGetCoeffBlendKnownComponentsTest.cpp +++ b/tests/GrGetCoeffBlendKnownComponentsTest.cpp @@ -11,9 +11,18 @@ #include "GrBlend.h" #include "SkGr.h" -#include "SkGrPriv.h" #include "SkRandom.h" +static inline SkPMColor GrColorToSkPMColor(GrColor c) { + GrColorIsPMAssert(c); + return SkPackARGB32(GrColorUnpackA(c), GrColorUnpackR(c), GrColorUnpackG(c), GrColorUnpackB(c)); +} + +static inline GrColor SkPMColorToGrColor(SkPMColor c) { + return GrColorPackRGBA(SkGetPackedR32(c), SkGetPackedG32(c), SkGetPackedB32(c), + SkGetPackedA32(c)); +} + static GrColor make_baseline_color(GrColor src, GrColor dst, const SkXfermode* xm) { SkPMColor skSrc = GrColorToSkPMColor(src); SkPMColor skDst = GrColorToSkPMColor(dst); diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index c033ebc529..f9a0147bd7 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -18,7 +18,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrSurfaceProxy.h" -#include "SkGrPriv.h" +#include "SkGr.h" #endif |