Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: src/core/SkImageCacherator.cpp

Issue 1225923010: Refugee from Dead Machine 4: MDB Monster Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Last update from dead machine Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkComposeShader.cpp ('k') | src/core/SkImageFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkImageCacherator.cpp
diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp
index 75fef5a8afe3bbd4db4078281d18c38840a84788..3050084f9de6bcce328b24aff9c4adb3f95ff8a2 100644
--- a/src/core/SkImageCacherator.cpp
+++ b/src/core/SkImageCacherator.cpp
@@ -292,7 +292,13 @@ protected:
// GrTexture* generateTextureForParams(GrContext*, const SkGrStretch&) override;
GrTexture* refOriginalTexture(GrContext* ctx) override {
- return fCacher->lockTexture(ctx, fOriginalKey, fClient);
+ GrTexture* tmp = fCacher->lockTexture(ctx, fOriginalKey, fClient);
+
+ if (!fOriginalKey.isValid() && tmp->fromRawPixels2()) {
+ tmp->setException(true);
+ }
+
+ return tmp;
}
void makeCopyKey(const CopyParams& stretch, GrUniqueKey* paramsCopyKey) override {
« no previous file with comments | « src/core/SkComposeShader.cpp ('k') | src/core/SkImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698