diff options
author | Eric Karl <ericrk@chromium.org> | 2017-12-15 23:37:45 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-15 23:57:41 +0000 |
commit | aae533e418f37d788cdb1a1177e882d0f8868b62 (patch) | |
tree | 6e2b29d025b4058f86fb834c83b037efec0d5232 /src/image/SkImage.cpp | |
parent | b2e3a3ada25301a2141b800c9b9278d6d07975f7 (diff) |
Revert "Remove SkImage deferred texture image data APIs."
This reverts commit 4f5e1d4ff3fa9f240398c9a08be94beb1c16dad0.
Reason for revert: Unfortunately, we need this in Chrome for a bit longer. Working on understanding why the new path led to regressions. Will re-land this once the new path sticks.
Original change's description:
> Remove SkImage deferred texture image data APIs.
>
> These APIs existed for Chrome. Chrome is no longer using them.
>
> Change-Id: I15a5e2f88c7e8d1356188748fc68d4658f6f1849
> Reviewed-on: https://skia-review.googlesource.com/81021
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,brianosman@google.com,caryclark@google.com,caryclark@skia.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: Ic9f683f262f2e1d0469156360f5ffaee977ca44a
Reviewed-on: https://skia-review.googlesource.com/86280
Reviewed-by: Eric Karl <ericrk@chromium.org>
Commit-Queue: Eric Karl <ericrk@chromium.org>
Diffstat (limited to 'src/image/SkImage.cpp')
-rw-r--r-- | src/image/SkImage.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 31104d2548..af791b4380 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -358,6 +358,19 @@ sk_sp<SkImage> SkImage::MakeFromTexture(GrContext* ctx, return nullptr; } +size_t SkImage::getDeferredTextureImageData(const GrContextThreadSafeProxy&, + const DeferredTextureImageUsageParams[], + int paramCnt, void* buffer, + SkColorSpace* dstColorSpace, + SkColorType dstColorType) const { + return 0; +} + +sk_sp<SkImage> SkImage::MakeFromDeferredTextureImageData(GrContext* context, const void*, + SkBudgeted) { + return nullptr; +} + bool SkImage::MakeBackendTextureFromSkImage(GrContext*, sk_sp<SkImage>, GrBackendTexture*, |