Make SkAndroidCodec support bmp

Make SkAndroidCodec support bmp

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/887e18e5f7b79397a3d4df7f5c74de13ba3a95d4

[msarett, 2015-11-13 20:37:30]

Patchset #1 (id:1) has been deleted

[msarett, 2015-11-13 20:45:56]

Patchset #1 (id:20001) has been deleted

[msarett, 2015-11-16 14:50:33]

Patchset #1 (id:40001) has been deleted

[msarett, 2015-11-16 20:43:32]

Patchset #1 (id:60001) has been deleted

[msarett, 2015-11-16 20:44:28]

msarett@google.com changed reviewers:
+ scroggo@google.com

[scroggo, 2015-11-17 15:33:17]

lgtm

https://codereview.chromium.org/1443783002/diff/80001/src/codec/SkSampledCode...
File src/codec/SkSampledCodec.cpp (right):

https://codereview.chromium.org/1443783002/diff/80001/src/codec/SkSampledCode...
src/codec/SkSampledCodec.cpp:240: result = SkCodec::kIncompleteInput;
This might be 6 of one, half a dozen of the other, but I think the following
might be a little simpler (it at least eliminates a variable):

if (1 != fCodec->getScanlines(...)) {
  break;
}
...
if (!fCodec->skipScanlines(1)) {
  break;
}

if (nativeSize.height() == y) {
  return SkCodec::kSuccess;
}

// fill uninitialized memory
return SkCodec::kIncompleteInput;

[msarett, 2015-11-17 16:06:25]

https://codereview.chromium.org/1443783002/diff/80001/src/codec/SkSampledCode...
File src/codec/SkSampledCodec.cpp (right):

https://codereview.chromium.org/1443783002/diff/80001/src/codec/SkSampledCode...
src/codec/SkSampledCodec.cpp:240: result = SkCodec::kIncompleteInput;
On 2015/11/17 15:33:17, scroggo wrote:
> This might be 6 of one, half a dozen of the other, but I think the following
> might be a little simpler (it at least eliminates a variable):
> 
> if (1 != fCodec->getScanlines(...)) {
>   break;
> }
> ...
> if (!fCodec->skipScanlines(1)) {
>   break;
> }
> 
> if (nativeSize.height() == y) {
>   return SkCodec::kSuccess;
> }
> 
> // fill uninitialized memory
> return SkCodec::kIncompleteInput;

I think this approach makes things a little clearer.  I've changed this.

[scroggo, 2015-11-17 16:13:58]

https://codereview.chromium.org/1443783002/diff/100001/src/codec/SkSampledCod...
File src/codec/SkSampledCodec.cpp (right):

https://codereview.chromium.org/1443783002/diff/100001/src/codec/SkSampledCod...
src/codec/SkSampledCodec.cpp:249: return SkCodec::kSuccess;
nit: four space indent

(Joke's on you for copying my comments exactly!)

https://codereview.chromium.org/1443783002/diff/100001/src/codec/SkSampledCod...
src/codec/SkSampledCodec.cpp:257: if (is_coord_necessary(srcY, sampleY,
dstHeight)) {
nit: You could give yourself a little extra width (and maybe make your
statements on one line) if you change this if:

if (!is_coord_necessary(...)) {
    continue;
}
void* pixelPtr ...

Fine as-is though.

https://codereview.chromium.org/1443783002/diff/100001/src/codec/SkSampledCod...
src/codec/SkSampledCodec.cpp:260: SkSampler::Fill(info.makeWH(info.width(), 1),
pixelPtr, rowBytes, fillValue,
nit: I think you should create this info once outside the loop.

[msarett, 2015-11-17 16:24:27]

https://codereview.chromium.org/1443783002/diff/100001/src/codec/SkSampledCod...
File src/codec/SkSampledCodec.cpp (right):

https://codereview.chromium.org/1443783002/diff/100001/src/codec/SkSampledCod...
src/codec/SkSampledCodec.cpp:249: return SkCodec::kSuccess;
On 2015/11/17 16:13:58, scroggo wrote:
> nit: four space indent
> 
> (Joke's on you for copying my comments exactly!)

:).  Not the first time I've fallen for this.

https://codereview.chromium.org/1443783002/diff/100001/src/codec/SkSampledCod...
src/codec/SkSampledCodec.cpp:257: if (is_coord_necessary(srcY, sampleY,
dstHeight)) {
On 2015/11/17 16:13:58, scroggo wrote:
> nit: You could give yourself a little extra width (and maybe make your
> statements on one line) if you change this if:
> 
> if (!is_coord_necessary(...)) {
>     continue;
> }
> void* pixelPtr ...
> 
> Fine as-is though.

sgtm

https://codereview.chromium.org/1443783002/diff/100001/src/codec/SkSampledCod...
src/codec/SkSampledCodec.cpp:260: SkSampler::Fill(info.makeWH(info.width(), 1),
pixelPtr, rowBytes, fillValue,
On 2015/11/17 16:13:58, scroggo wrote:
> nit: I think you should create this info once outside the loop.

Done.

[scroggo, 2015-11-17 16:27:54]

LGTM

[msarett, 2015-11-17 16:33:31]

The CQ bit was checked by msarett@google.com

[commit-bot: I haz the power, 2015-11-17 16:33:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1443783002/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1443783002/120001

[commit-bot: I haz the power, 2015-11-17 16:46:05]

Committed patchset #3 (id:120001) as
https://skia.googlesource.com/skia/+/887e18e5f7b79397a3d4df7f5c74de13ba3a95d4