aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-05-08 20:46:17 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-08 20:46:26 +0000
commit449d78f5a8e73407b314aa6cb4e60a8273f0d410 (patch)
treee2cf8993a9dc917b69aa0dcfb0bc7904fbdf05e6 /include
parent823bdd96ef85c2e8bbea2bbeeff270b29755413d (diff)
Revert "Added SkImage::MakeCrossContextFromEncoded"
This reverts commit 83b1b3db36e8622f4bbc8c391d5c714e258d1e03. Reason for revert: unit test failing and asan leaks Original change's description: > Added SkImage::MakeCrossContextFromEncoded > > Designed for Flutter's threading architecture, with > an eye to being useful to other clients. Under the > hood, uses a new image generator class to lazily wrap > a texture for multiple GrContexts. > > Bug: skia: > Change-Id: I6c37b12c8ab5bce94b91190e5f0beb91d31ae81b > Reviewed-on: https://skia-review.googlesource.com/14180 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,brianosman@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I1f0bf580aa0ea2d132e18b64ff610ddac9d073a7 Reviewed-on: https://skia-review.googlesource.com/15892 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/core/SkImage.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 2ba67619fe..e7cb3f3e33 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -159,21 +159,6 @@ public:
SkAlphaType, sk_sp<SkColorSpace>,
TextureReleaseProc, ReleaseContext);
- /**
- * Decodes and uploads the encoded data to a GPU backed image using the supplied GrContext.
- * That image can be safely used by other GrContexts, across thread boundaries. The GrContext
- * used here, and the ones used to draw this image later must be in the same GL share group,
- * or otherwise be able to share resources.
- *
- * When the image's ref count reaches zero, the original GrContext will destroy the texture,
- * asynchronously.
- *
- * The texture will be decoded and uploaded to be suitable for use with surfaces that have the
- * supplied destination color space. The color space of the image itself will be determined
- * from the encoded data.
- */
- static sk_sp<SkImage> MakeCrossContextFromEncoded(GrContext*, sk_sp<SkData>, bool buildMips,
- SkColorSpace* dstColorSpace);
/**
* Create a new image from the specified descriptor. Note - Skia will delete or recycle the