hide discardable factory from public imagegenerator api

hide discardable factory from public imagegenerator api

BUG=skia:

Committed: http://code.google.com/p/skia/source/detail?r=14889

[hal.canary, 2014-05-23 19:25:00]

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

https://codereview.chromium.org/295243006/diff/20001/include/core/SkImageGene...
include/core/SkImageGenerator.h:33: *  @param factory If not NULL, this object
will be used as a
remove me

https://codereview.chromium.org/295243006/diff/20001/src/core/SkImageGenerato...
File src/core/SkImageGeneratorPriv.h (right):

https://codereview.chromium.org/295243006/diff/20001/src/core/SkImageGenerato...
src/core/SkImageGeneratorPriv.h:14: bool
SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination,
add that documentation here.

[scroggo, 2014-05-23 19:30:29]

https://codereview.chromium.org/295243006/diff/20001/tests/ImageDecodingTest.cpp
File tests/ImageDecodingTest.cpp (right):

https://codereview.chromium.org/295243006/diff/20001/tests/ImageDecodingTest....
tests/ImageDecodingTest.cpp:485: static SkPixelRef* install_pixel_ref(SkBitmap*
bitmap,
This function shows how Android is supposed to replace SkImageRef.

Right now, it depends on passing an SkDiscardableMemory::Factory to
SkInstallDiscardablePixelRef.

My understand is that Derek does *not* want Android depending on anything inside
src (which fits with my idea of a private header file). Since you've moved the
version that takes a factory into src, how is Android supposed to call it?

[scroggo, 2014-05-23 19:57:11]

1gtm, so long as Hal's patch lands and you address his comments in this one.

https://codereview.chromium.org/295243006/diff/20001/tests/ImageDecodingTest.cpp
File tests/ImageDecodingTest.cpp (right):

https://codereview.chromium.org/295243006/diff/20001/tests/ImageDecodingTest....
tests/ImageDecodingTest.cpp:485: static SkPixelRef* install_pixel_ref(SkBitmap*
bitmap,
On 2014/05/23 19:30:30, scroggo wrote:
> This function shows how Android is supposed to replace SkImageRef.
> 
> Right now, it depends on passing an SkDiscardableMemory::Factory to
> SkInstallDiscardablePixelRef.
> 
> My understand is that Derek does *not* want Android depending on anything
inside
> src (which fits with my idea of a private header file). Since you've moved the
> version that takes a factory into src, how is Android supposed to call it?

Hal has a fix in https://codereview.chromium.org/293283002/

[reed1, 2014-05-27 12:13:26]

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

https://codereview.chromium.org/295243006/diff/20001/include/core/SkImageGene...
include/core/SkImageGenerator.h:33: *  @param factory If not NULL, this object
will be used as a
On 2014/05/23 19:25:01, Hal Canary wrote:
> remove me

Done.

https://codereview.chromium.org/295243006/diff/20001/src/core/SkImageGenerato...
File src/core/SkImageGeneratorPriv.h (right):

https://codereview.chromium.org/295243006/diff/20001/src/core/SkImageGenerato...
src/core/SkImageGeneratorPriv.h:14: bool
SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination,
On 2014/05/23 19:25:01, Hal Canary wrote:
> add that documentation here.

Done.

[reed1, 2014-05-27 13:04:04]

ptal

[scroggo, 2014-05-27 13:32:03]

lgtm

[hal.canary, 2014-05-27 13:33:53]

lgtm

https://codereview.chromium.org/295243006/diff/20001/tests/ImageDecodingTest.cpp
File tests/ImageDecodingTest.cpp (right):

https://codereview.chromium.org/295243006/diff/20001/tests/ImageDecodingTest....
tests/ImageDecodingTest.cpp:485: static SkPixelRef* install_pixel_ref(SkBitmap*
bitmap,
On 2014/05/23 19:57:12, scroggo wrote:
> Hal has a fix in https://codereview.chromium.org/293283002/

Which has landed, so you can rebase.

https://codereview.chromium.org/295243006/diff/40001/tests/ImageDecodingTest.cpp
File tests/ImageDecodingTest.cpp (right):

https://codereview.chromium.org/295243006/diff/40001/tests/ImageDecodingTest....
tests/ImageDecodingTest.cpp:19: #include "SkImageGeneratorPriv.h"
do we still need this?

[reed1, 2014-05-27 14:07:57]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2014-05-27 14:08:08]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/reed@google.com/295243006/40001

[commit-bot: I haz the power, 2014-05-27 14:14:27]

Change committed as 14889