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 /bench | |
| 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 'bench')
| -rw-r--r-- | bench/RotatedRectBench.cpp | 3 | ||||
| -rw-r--r-- | bench/Xfer4fBench.cpp | 2 | ||||
| -rw-r--r-- | bench/XferF16Bench.cpp | 2 | ||||
| -rw-r--r-- | bench/XfermodeBench.cpp | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/bench/RotatedRectBench.cpp b/bench/RotatedRectBench.cpp index f81bfb1d10..d9ee5823bf 100644 --- a/bench/RotatedRectBench.cpp +++ b/bench/RotatedRectBench.cpp @@ -6,6 +6,7 @@ */ #include "Benchmark.h" +#include "SkBlendModePriv.h" #include "SkCanvas.h" #include "SkPaint.h" @@ -144,7 +145,7 @@ private: fName.append("_alternating_transparent_and_opaque"); break; } - fName.appendf("_%s", to_lower(SkXfermode::ModeName(fMode)).c_str()); + fName.appendf("_%s", to_lower(SkBlendMode_Name(fMode)).c_str()); } bool fAA; diff --git a/bench/Xfer4fBench.cpp b/bench/Xfer4fBench.cpp index 0e99c8c3f2..5e679a826e 100644 --- a/bench/Xfer4fBench.cpp +++ b/bench/Xfer4fBench.cpp @@ -8,7 +8,7 @@ #include "Benchmark.h" #include "SkPM4f.h" #include "SkString.h" -#include "SkXfermode.h" +#include "SkXfermodePriv.h" #define USE_AA (1 << 31) // merge with Xfermode::PMFlags w/o conflict diff --git a/bench/XferF16Bench.cpp b/bench/XferF16Bench.cpp index 14505fd6bf..bd44effd05 100644 --- a/bench/XferF16Bench.cpp +++ b/bench/XferF16Bench.cpp @@ -8,7 +8,7 @@ #include "Benchmark.h" #include "SkPM4f.h" #include "SkString.h" -#include "SkXfermode.h" +#include "SkXfermodePriv.h" #define USE_AA (1 << 31) // merge with Xfermode::PMFlags w/o conflict diff --git a/bench/XfermodeBench.cpp b/bench/XfermodeBench.cpp index 9e148d4317..605d167296 100644 --- a/bench/XfermodeBench.cpp +++ b/bench/XfermodeBench.cpp @@ -6,18 +6,18 @@ */ #include "Benchmark.h" +#include "SkBlendModePriv.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkRandom.h" #include "SkString.h" -#include "SkXfermode.h" // Benchmark that draws non-AA rects or AA text with an SkXfermode::Mode. class XfermodeBench : public Benchmark { public: XfermodeBench(SkBlendMode mode, bool aa) : fBlendMode(mode) { fAA = aa; - fName.printf("Xfermode_%s%s", SkXfermode::ModeName(mode), aa ? "_aa" : ""); + fName.printf("Xfermode_%s%s", SkBlendMode_Name(mode), aa ? "_aa" : ""); } protected: |