Chromium Code Reviews| Index: dm/DMSrcSink.cpp |
| diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp |
| index f9fa818a7826e305e5d443f2eec8705d5b194e32..3a315074998556cdfa02ec61573de9e97c89b5d2 100644 |
| --- a/dm/DMSrcSink.cpp |
| +++ b/dm/DMSrcSink.cpp |
| @@ -87,10 +87,10 @@ SkScanlineDecoder* start_scanline_decoder(SkData* encoded, const SkImageInfo& in |
| } |
| // DM scanline test assume kTopDown scanline ordering. Other orderings are |
| // tested from within SkScaledCodec. |
| - if (SkScanlineDecoder::kTopDown_SkScanlineOrder != scanlineDecoder->getScanlineOrder()) { |
| + if (SkCodec::kSuccess != scanlineDecoder->start(info, NULL, colorPtr, colorCountPtr)) { |
|
scroggo
2015/08/27 16:35:49
Why did this move? Also, it seems like the comment
msarett
2015/09/01 17:50:15
This moved because gifs don't know their SkScanlin
|
| return NULL; |
| } |
| - if (SkCodec::kSuccess != scanlineDecoder->start(info, NULL, colorPtr, colorCountPtr)) { |
| + if (SkScanlineDecoder::kTopDown_SkScanlineOrder != scanlineDecoder->getScanlineOrder()) { |
|
msarett
2015/08/24 23:20:12
In gif we don't know the scanline order until we c
scroggo
2015/08/27 16:35:49
We spoke about this a little in person, but I'll a
msarett
2015/09/01 17:50:15
Just want to clarify that there are two different
msarett
2015/09/01 21:37:52
This issue isn't critical right now. We'll keep t
|
| return NULL; |
| } |
| return scanlineDecoder.detach(); |