Fix tests: conformance_textures_image_bitmap_from_image_data on Android

Fix tests: conformance_textures_image_bitmap_from_image_data on Android

Right now these tests are failing, and the reason is that in our previous
CL here: https://codereview.chromium.org/2183323003, we made a change
such that the function swizzleImageData() is called only when
kN32_SkColorType == kBGRA_8888_SkColorType. That means on the Android
platform this function will not be called. What I didn't realize is that
this function itself also contains flip the input data vertically which
is required when flipY is true. Right now on the Android bots, whenever
the flipY is true, these tests will fail.

This CL changes the function swizzleImageData() so that this function
determines whether swizle is needed or not based on this:
kN32_SkColorType == kBGRA_8888_SkColorType

BUG=633214
Committed: https://crrev.com/909e62f21bef265278f12a398af788e2c02060f8
Cr-Commit-Position: refs/heads/master@{#409225}

[xidachen, 2016-08-02 01:44:31]

xidachen@chromium.org changed reviewers:
+ jbroman@chromium.org, junov@chromium.org

[xidachen, 2016-08-02 01:44:32]

PTAL

[Justin Novosad, 2016-08-02 15:41:48]

On 2016/08/02 01:44:32, xidachen wrote:
> PTAL

lgtm

[xidachen, 2016-08-02 15:44:25]

The CQ bit was checked by xidachen@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-02 15:44:38]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-02 17:35:27]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-02 17:35:28]

Dry run: This issue passed the CQ dry run.

[xidachen, 2016-08-02 17:36:01]

The CQ bit was checked by xidachen@chromium.org

[commit-bot: I haz the power, 2016-08-02 17:36:31]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-02 17:41:18]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-08-02 17:43:28]

Description was changed from

==========
Fix tests: conformance_textures_image_bitmap_from_image_data on Android

Right now these tests are failing, and the reason is that in our previous
CL here: https://codereview.chromium.org/2183323003, we made a change
such that the function swizzleImageData() is called only when
kN32_SkColorType == kBGRA_8888_SkColorType. That means on the Android
platform this function will not be called. What I didn't realize is that
this function itself also contains flip the input data vertically which
is required when flipY is true. Right now on the Android bots, whenever
the flipY is true, these tests will fail.

This CL changes the function swizzleImageData() so that this function
determines whether swizle is needed or not based on this:
kN32_SkColorType == kBGRA_8888_SkColorType

BUG=633214
==========

to

==========
Fix tests: conformance_textures_image_bitmap_from_image_data on Android

Right now these tests are failing, and the reason is that in our previous
CL here: https://codereview.chromium.org/2183323003, we made a change
such that the function swizzleImageData() is called only when
kN32_SkColorType == kBGRA_8888_SkColorType. That means on the Android
platform this function will not be called. What I didn't realize is that
this function itself also contains flip the input data vertically which
is required when flipY is true. Right now on the Android bots, whenever
the flipY is true, these tests will fail.

This CL changes the function swizzleImageData() so that this function
determines whether swizle is needed or not based on this:
kN32_SkColorType == kBGRA_8888_SkColorType

BUG=633214

Committed: https://crrev.com/909e62f21bef265278f12a398af788e2c02060f8
Cr-Commit-Position: refs/heads/master@{#409225}
==========

[commit-bot: I haz the power, 2016-08-02 17:43:29]

Patchset 3 (id:??) landed as
https://crrev.com/909e62f21bef265278f12a398af788e2c02060f8
Cr-Commit-Position: refs/heads/master@{#409225}