diff options
| author |  Mike Reed <reed@google.com> | 2016-11-15 16:44:34 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-16 15:38:11 +0000 |
| commit | d47067392848ba132d4e86ffbeebe2dcacda9534 (patch) | |
| tree | 456bd4182524d55f19117d8e726bacca50059fa8 /gn | |
| parent | 988283c89458442f65d961f2746a9f271a39c31e (diff) | |
make SkXfermode.h go away
This is step one:
- make SkXfermode useless to public clients
- everything they should need is in SkBlendMode.h
Step two:
- remove SkXfermode.h entirely (since skia core will already be using SkXfermodePriv.h)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4534
Change-Id: If2cea9f71df92430ed6644edb98dd306c5572cbc
Reviewed-on: https://skia-review.googlesource.com/4534
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/android_framework_defines.gni | 1 | ||||
| -rw-r--r-- | gn/core.gni | 1 | ||||
| -rw-r--r-- | gn/tests.gni | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni index 90fea2fb25..1e61d377b3 100644 --- a/gn/android_framework_defines.gni +++ b/gn/android_framework_defines.gni @@ -15,4 +15,5 @@ android_framework_defines = [ "SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT", "SK_SUPPORT_LEGACY_CLIP_REGIONOPS", "SK_SUPPORT_LEGACY_SHADER_ISABITMAP", + "SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC", ] diff --git a/gn/core.gni b/gn/core.gni index 60c7761ef5..d7f11569a8 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -442,7 +442,6 @@ skia_core_sources = [ "$_include/core/SkTypes.h", "$_include/core/SkUnPreMultiply.h", "$_include/core/SkWriter32.h", - "$_include/core/SkXfermode.h", # private "$_include/private/SkAtomics.h", diff --git a/gn/tests.gni b/gn/tests.gni index d828297b5b..d888c6a152 100644 --- a/gn/tests.gni +++ b/gn/tests.gni @@ -245,7 +245,6 @@ tests_sources = [ "$_tests/WindowRectanglesTest.cpp", "$_tests/WritePixelsTest.cpp", "$_tests/Writer32Test.cpp", - "$_tests/XfermodeTest.cpp", "$_tests/YUVCacheTest.cpp", "$_tests/YUVTest.cpp", ] |