Avoid getLength in ico decoder.

Avoid getLength in ico decoder.

Only call getLength() if hasLength() returned true. Otherwise, copy the
stream into an SkDynamicMemoryWStream and copy it into alloc'ed space.

Share common code between bmp and ico.

BUG=https://b.corp.google.com/issue?id=8432093
R=djsollen@google.com

Committed: https://code.google.com/p/skia/source/detail?r=10850

[djsollen, 2013-08-19 16:57:20]

https://codereview.chromium.org/23330002/diff/1/src/images/SkImageDecoder_lib...
File src/images/SkImageDecoder_libbmp.cpp (right):

https://codereview.chromium.org/23330002/diff/1/src/images/SkImageDecoder_lib...
src/images/SkImageDecoder_libbmp.cpp:96: extern size_t
copy_stream_to_storage(SkAutoMalloc* storage, SkStream* stream);
why not make it a protected method on SkImageDecoder or better yet in some
utility file (.h/.cpp combo) so that we don't have to extern it here.

[scroggo, 2013-08-19 18:45:55]

https://codereview.chromium.org/23330002/diff/1/src/images/SkImageDecoder_lib...
File src/images/SkImageDecoder_libbmp.cpp (right):

https://codereview.chromium.org/23330002/diff/1/src/images/SkImageDecoder_lib...
src/images/SkImageDecoder_libbmp.cpp:96: extern size_t
copy_stream_to_storage(SkAutoMalloc* storage, SkStream* stream);
On 2013/08/19 16:57:20, djsollen wrote:
> why not make it a protected method on SkImageDecoder or better yet in some
> utility file (.h/.cpp combo) so that we don't have to extern it here.

Done.

[djsollen, 2013-08-19 19:03:54]

lgtm

[scroggo, 2013-08-21 15:02:35]

Committed patchset #2 manually as r10850 (presubmit successful).