diff options
| author |  msarett <msarett@google.com> | 2015-09-01 14:57:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-01 14:57:57 -0700 |
| commit | 9e707a04127f35b199bb943b6f50ff4cf60506f8 (patch) | |
| tree | ec7de7bd5535bde72d3bc1a5aa4ba2ca9d6cf760 /dm/DMSrcSink.h | |
| parent | 9aa32d1d830c030000c1178b1297035a9b53d5bc (diff) | |
Various improvements to CodecSrc testing in dm
*** Add CodecMode and ScaledCodecMode (in place of
NormalMode), so now we test SkCodec's getPixels() and
SkScaledCodec's getPixels()
*** Don't attempt to test scanline and codec modes using
the dimensions that were recommended for SkScaledCodec.
*** Change tags so that each scale gets its own output
folder.
TODO: Make ScanlineMode and ScanlineSubsetMode support
kOutOfOrder etc. I think this belongs with the gif CL -
I don't want to add test modes that we don't run yet.
BUG=skia:4202
BUG=skia:4238
Review URL: https://codereview.chromium.org/1327433003
Diffstat (limited to 'dm/DMSrcSink.h')
| -rw-r--r-- | dm/DMSrcSink.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index e5f22f8267..efae87138e 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -24,6 +24,7 @@ namespace DM { struct ImplicitString : public SkString { template <typename T> ImplicitString(const T& s) : SkString(s) {} + ImplicitString() : SkString("") {} }; typedef ImplicitString Name; typedef ImplicitString Path; @@ -102,7 +103,8 @@ private: class CodecSrc : public Src { public: enum Mode { - kNormal_Mode, + kScaledCodec_Mode, + kCodec_Mode, kScanline_Mode, kScanline_Subset_Mode, kStripe_Mode, // Tests the skipping of scanlines @@ -120,10 +122,10 @@ public: Name name() const override; bool veto(SinkFlags) const override; private: - Path fPath; - Mode fMode; - DstColorType fDstColorType; - float fScale; + Path fPath; + Mode fMode; + DstColorType fDstColorType; + float fScale; }; |