add ImageGenerator::NewFromData to porting layer

add ImageGenerator::NewFromData to porting layer

BUG=skia:3275
Committed: https://skia.googlesource.com/skia/+/5965c8ae4ee960275da4bc40189bdba85aab8b5e

[reed1, 2015-01-05 22:32:51]

reed@google.com changed reviewers:
+ fmalita@google.com, halcanary@google.com, scroggo@google.com

[reed1, 2015-01-05 22:32:52]

WIP -- intended to allow Chrome/Blink to implement this function so Skia can get
access to their codecs.

[scroggo, 2015-01-05 22:44:54]

On 2015/01/05 22:32:52, reed1 wrote:
> WIP -- intended to allow Chrome/Blink to implement this function so Skia can
get
> access to their codecs.

looks like a reasonable start to me.

[reed1, 2015-01-06 19:35:10]

I am trying to preflight this so it can land in chrome (with a diff impl of
NewFromData) but from skia's perspective, PTAL

[scroggo, 2015-01-06 19:50:15]

https://codereview.chromium.org/834633006/diff/40001/src/ports/SkImageGenerat...
File src/ports/SkImageGenerator_skia.cpp (right):

https://codereview.chromium.org/834633006/diff/40001/src/ports/SkImageGenerat...
src/ports/SkImageGenerator_skia.cpp:58: SkAutoTUnref<BareMemoryAllocator>
allocator(SkNEW_ARGS(BareMemoryAllocator,
You could put the BareMemoryAllocator on the stack if you remove it after
decoding.

[hal.canary, 2015-01-06 20:06:40]

https://codereview.chromium.org/834633006/diff/40001/include/core/SkImageGene...
File include/core/SkImageGenerator.h (right):

https://codereview.chromium.org/834633006/diff/40001/include/core/SkImageGene...
include/core/SkImageGenerator.h:36: SK_API bool
SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination);
Since we have a porting layer now, let's add convenience functions:

bool SkInstallDiscardablePixelRef(SkData* data, SkBitmap* dst) {
    return SkInstallDiscardablePixelRef(
            SkImageGenerator::NewFromData(data), dst);
}

bool SkDecodeData(SkData* data, SkBitmap* dst) {
    SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromData(data));
    SkImageInfo info;
    if (!gen.get() || !gen->getInfo(&info)) {
        return false;
    }
    if (info.colorType == kIndex_8_SkColorType) {
        SkPMColor colors[256];
        int colorCount = 0;
        size_t rowBytes = info.minRowBytes();
        SkAutoMalloc pixels(info.getSafeSize(rowBytes));
        if (!gen->getPixels(info, autoMalloc.get(), rowBytes, colors,
                            &colorCount)) {
            return false;
        }
        SkAutoTUnref<SkColorTable> colorTable(
                SkNEW_ARGS(SkColorTable, (colors, colorCount)));
        dst->installPixels(info, pixels.detach(), rowBytes, colorTable,
                           &sk_free_release_proc, NULL);
        return true;
    } else {
        SkBitmap bm; 
        bm.allocPixels(info);
        SkAutoLockPixels autoLockPixels(bm);
        if (!gen->getPixels(bm.info(), bm.getPixels(), bm.rowBytes())) {
            return false;
        }
        bm.swap(*dst);
        return true;
    }
}

https://codereview.chromium.org/834633006/diff/40001/src/ports/SkImageGenerat...
File src/ports/SkImageGenerator_skia.cpp (right):

https://codereview.chromium.org/834633006/diff/40001/src/ports/SkImageGenerat...
src/ports/SkImageGenerator_skia.cpp:2: * Copyright 2015 The Android Open Source
Project
 * Copyright 2015 Google Inc.

https://codereview.chromium.org/834633006/diff/40001/src/ports/SkImageGenerat...
src/ports/SkImageGenerator_skia.cpp:91: SkMemoryStream stream(fData->data(),
fData->size(), false);
    SkMemoryStream stream(fData);

is simpler.

[hal.canary, 2015-01-06 20:14:48]

https://codereview.chromium.org/834633006/diff/40001/include/core/SkImageGene...
File include/core/SkImageGenerator.h (right):

https://codereview.chromium.org/834633006/diff/40001/include/core/SkImageGene...
include/core/SkImageGenerator.h:36: SK_API bool
SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination);
Also, 

class SkImage {
    static SkImage* NewFromData(SkData*) {
        return SkImage::NewFromGenerator(SkImageGenerator::NewFromData(data));
    }
}

[hal.canary, 2015-01-06 20:16:04]

On 2015/01/06 20:14:48, Hal Canary wrote:
>
https://codereview.chromium.org/834633006/diff/40001/include/core/SkImageGene...
> File include/core/SkImageGenerator.h (right):
> 
>
https://codereview.chromium.org/834633006/diff/40001/include/core/SkImageGene...
> include/core/SkImageGenerator.h:36: SK_API bool
> SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination);
> Also, 
> 
> class SkImage {
>     static SkImage* NewFromData(SkData*) {
>         return SkImage::NewFromGenerator(SkImageGenerator::NewFromData(data));
>     }
> }

D'oh.  I see that now.

[reed1, 2015-01-07 16:09:23]

https://codereview.chromium.org/834633006/diff/40001/include/core/SkImageGene...
File include/core/SkImageGenerator.h (right):

https://codereview.chromium.org/834633006/diff/40001/include/core/SkImageGene...
include/core/SkImageGenerator.h:36: SK_API bool
SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination);
On 2015/01/06 20:06:40, Hal Canary wrote:
> Since we have a porting layer now, let's add convenience functions:
> 
> bool SkInstallDiscardablePixelRef(SkData* data, SkBitmap* dst) {
>     return SkInstallDiscardablePixelRef(
>             SkImageGenerator::NewFromData(data), dst);
> }
> 
> bool SkDecodeData(SkData* data, SkBitmap* dst) {
>     SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromData(data));
>     SkImageInfo info;
>     if (!gen.get() || !gen->getInfo(&info)) {
>         return false;
>     }
>     if (info.colorType == kIndex_8_SkColorType) {
>         SkPMColor colors[256];
>         int colorCount = 0;
>         size_t rowBytes = info.minRowBytes();
>         SkAutoMalloc pixels(info.getSafeSize(rowBytes));
>         if (!gen->getPixels(info, autoMalloc.get(), rowBytes, colors,
>                             &colorCount)) {
>             return false;
>         }
>         SkAutoTUnref<SkColorTable> colorTable(
>                 SkNEW_ARGS(SkColorTable, (colors, colorCount)));
>         dst->installPixels(info, pixels.detach(), rowBytes, colorTable,
>                            &sk_free_release_proc, NULL);
>         return true;
>     } else {
>         SkBitmap bm; 
>         bm.allocPixels(info);
>         SkAutoLockPixels autoLockPixels(bm);
>         if (!gen->getPixels(bm.info(), bm.getPixels(), bm.rowBytes())) {
>             return false;
>         }
>         bm.swap(*dst);
>         return true;
>     }
> }

Acknowledged.

[scroggo, 2015-01-07 21:47:45]

lgtm

(at patch set 3 or 4. I meant to hit the lgtm button last time....)

https://codereview.chromium.org/834633006/diff/60001/include/core/SkImageGene...
File include/core/SkImageGenerator.h (right):

https://codereview.chromium.org/834633006/diff/60001/include/core/SkImageGene...
include/core/SkImageGenerator.h:39: *  On success, installs a discradable
pixelref into destination, based on encoded data.
discardable*

[reed2, 2015-01-08 01:53:41]

The CQ bit was checked by reed@chromium.org

[commit-bot: I haz the power, 2015-01-08 01:54:44]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/834633006/60001

[commit-bot: I haz the power, 2015-01-08 02:04:49]

Committed patchset #4 (id:60001) as
https://skia.googlesource.com/skia/+/5965c8ae4ee960275da4bc40189bdba85aab8b5e