Fixes for piping bitmaps with encoded data.

Fixes for piping bitmaps with encoded data.

Similar goals as https://codereview.chromium.org/14437012.

Builds on patch set 1 from that issue
(https://codereview.chromium.org/14437012/#ps1).

Instead of the changes in patch set 2 from that issue, this
changes SkOrderedWriteBuffer::writeBitmap to store whether an
SkBitmapHeap was used when to store the index of the SkBitmap.
SkOrderedReadBuffer::readBitmap now uses that information to
distinguish between using the heap and unflattening.

In addition, writeBitmap now records the width/height first in
all cases. If now SkBitmapHeapReader is attached, but an
SkBitmapHeap was used to record the bitmap, reading will fail
and provide the same red SkBitmap as in the case where the
SkBitmap was encoded but could not be decoded.

Updates the PICTURE_VERSION as well.

The key differences in this CL to look at are in:
SkOrderedWriteBuffer,
SkOrderedReadBuffer,
and SkPicture.

BUG=
R=djsollen@google.com

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

[scroggo, 2013-04-25 18:46:10]

Alternate solution to the changes in
https://codereview.chromium.org/14437012/#ps4001

[djsollen, 2013-04-25 19:20:36]

https://codereview.chromium.org/14230022/diff/1/src/core/SkOrderedWriteBuffer...
File src/core/SkOrderedWriteBuffer.cpp (right):

https://codereview.chromium.org/14230022/diff/1/src/core/SkOrderedWriteBuffer...
src/core/SkOrderedWriteBuffer.cpp:155: // 2. Write an encoded version of the
bitmap. Afterwards the width and height are written, so
update the comment now that things have moved.

https://codereview.chromium.org/14230022/diff/1/src/core/SkOrderedWriteBuffer...
src/core/SkOrderedWriteBuffer.cpp:165: this->writeUInt(0);
Per our discussion, since we are updating the picture format I would reorganize
this code.  In particular you can put the isHeap boolean first and then only the
int representing size when it is needed.

[scroggo, 2013-04-25 20:19:13]

https://codereview.chromium.org/14230022/diff/1/src/core/SkOrderedWriteBuffer...
File src/core/SkOrderedWriteBuffer.cpp (right):

https://codereview.chromium.org/14230022/diff/1/src/core/SkOrderedWriteBuffer...
src/core/SkOrderedWriteBuffer.cpp:155: // 2. Write an encoded version of the
bitmap. Afterwards the width and height are written, so
On 2013/04/25 19:20:36, djsollen wrote:
> update the comment now that things have moved.

Done.

https://codereview.chromium.org/14230022/diff/1/src/core/SkOrderedWriteBuffer...
src/core/SkOrderedWriteBuffer.cpp:165: this->writeUInt(0);
On 2013/04/25 19:20:36, djsollen wrote:
> Per our discussion, since we are updating the picture format I would
reorganize
> this code.  In particular you can put the isHeap boolean first and then only
the
> int representing size when it is needed.

Done.

[djsollen, 2013-04-26 16:14:22]

lgtm, but Mike may want to comment on the addition of the InstallPixelRefProc

[scroggo, 2013-04-30 02:34:38]

Committed patchset #3 manually as r8917 (presubmit successful).