diff options
author | 2016-08-16 15:11:24 -0700 | |
---|---|---|
committer | 2016-08-16 15:11:24 -0700 | |
commit | 36931c2b47f81db7ccf441937567c6fda72ad3e6 (patch) | |
tree | 9035684869f37b989ad73dc18e684b670d7e2b46 /src/ports/SkImageEncoder_CG.cpp | |
parent | db085ab30f58928623447676c46d6bd7a8cc2255 (diff) |
Add test for platform encoders, turn off platform encoders by default
Clients that like WIC and CG can still use them. And we can be
confident about that, since we now test WIC and CG.
Let Skia always use our own encoders by default, so we can do cool,
custom things on all platforms.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2250683003
Review-Url: https://codereview.chromium.org/2250683003
Diffstat (limited to 'src/ports/SkImageEncoder_CG.cpp')
-rw-r--r-- | src/ports/SkImageEncoder_CG.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/ports/SkImageEncoder_CG.cpp b/src/ports/SkImageEncoder_CG.cpp index 5b217e62ec..789285626c 100644 --- a/src/ports/SkImageEncoder_CG.cpp +++ b/src/ports/SkImageEncoder_CG.cpp @@ -126,6 +126,7 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm, /////////////////////////////////////////////////////////////////////////////// +#ifdef SK_USE_CG_ENCODER static SkImageEncoder* sk_imageencoder_cg_factory(SkImageEncoder::Type t) { switch (t) { case SkImageEncoder::kICO_Type: @@ -141,14 +142,10 @@ static SkImageEncoder* sk_imageencoder_cg_factory(SkImageEncoder::Type t) { } static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_cg_factory); +#endif -class SkPNGImageEncoder_CG : public SkImageEncoder_CG { -public: - SkPNGImageEncoder_CG() - : SkImageEncoder_CG(kPNG_Type) { - } -}; - -DEFINE_ENCODER_CREATOR(PNGImageEncoder_CG); +SkImageEncoder* CreateImageEncoder_CG(SkImageEncoder::Type type) { + return new SkImageEncoder_CG(type); +} #endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) |