aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkImageGenerator.h
diff options
context:
space:
mode:
authorGravatar Christopher Cameron <ccameron@chromium.org>2017-07-08 01:47:47 -0700
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-10 17:45:28 +0000
commit77e966647f6b495fe44772086c709528c711fc6e (patch)
treeab864785bf834f2743537c662fe90a4bb592ba39 /include/core/SkImageGenerator.h
parent62ae664e7491f77e1746a42418661c20c256c26d (diff)
Make SkImage_Lazy::onMakeColorSpace return a SkImage_Lazy
Make SkImage_Lazy::onMakeColorSpace return a new SkImage_Lazy with the color space of SkImage_Lazy::fInfo changed. Update the call to SkImageGenerator::getPixels to specify image info with this new color space. Update the call to SkImageGenerator::generateTexture to specify this new color space. Update SkPictureImageGenerator to respect the color space argument. Add a SkTransferFunctionBehavior argument to SkImageGenerator::generateTexture to indicate if color conversion is to be doing using an xform canvas. Update Generator_GrYUVProvider::refAsTextureProxy to include a color conversion step to respect this new color space. TBR=reed@google.com Bug:739559 Change-Id: I156a858884659e9dfae739a653bab2ef89274959 Reviewed-on: https://skia-review.googlesource.com/21605 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Christopher Cameron <ccameron@chromium.org> Reviewed-by: Christopher Cameron <ccameron@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'include/core/SkImageGenerator.h')
-rw-r--r--include/core/SkImageGenerator.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h
index 776df56368..2a536d8107 100644
--- a/include/core/SkImageGenerator.h
+++ b/include/core/SkImageGenerator.h
@@ -142,7 +142,8 @@ public:
* - it can somehow convert its texture into one that is valid for the provided context.
*/
sk_sp<GrTextureProxy> generateTexture(GrContext*, const SkImageInfo& info,
- const SkIPoint& origin);
+ const SkIPoint& origin,
+ SkTransferFunctionBehavior behavior);
#endif
/**
@@ -183,8 +184,8 @@ protected:
};
virtual TexGenType onCanGenerateTexture() const { return TexGenType::kNone; }
- virtual sk_sp<GrTextureProxy> onGenerateTexture(GrContext*, const SkImageInfo&,
- const SkIPoint&); // returns nullptr
+ virtual sk_sp<GrTextureProxy> onGenerateTexture(GrContext*, const SkImageInfo&, const SkIPoint&,
+ SkTransferFunctionBehavior); // returns nullptr
#endif
private: