aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-07-13 09:23:21 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-13 14:19:42 +0000
commit228482a709690135da4d67879fcc13885e9882e0 (patch)
treec478524937e6287d600e4a2a358ed909a1301d40 /src
parent68990be759f663bafdb7c1b746adce15557cda7f (diff)
Add abandoned context check to SkImage::MakeFromDeferredTextureImageData
Change-Id: Ibcae793339cfaf9dae8cb9122f387def535ce1bc Reviewed-on: https://skia-review.googlesource.com/23040 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/image/SkImage_Gpu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index aaaf23953b..fa507fe4af 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -891,7 +891,7 @@ sk_sp<SkImage> SkImage::MakeFromDeferredTextureImageData(GrContext* context, con
}
const DeferredTextureImage* dti = reinterpret_cast<const DeferredTextureImage*>(data);
- if (!context || context->uniqueID() != dti->fContextUniqueID) {
+ if (!context || context->uniqueID() != dti->fContextUniqueID || context->abandoned()) {
return nullptr;
}
int mipLevelCount = dti->fMipMapLevelCount;