Refugee from Dead Machine 4: MDB Monster

include/gpu/GrTextureProvider.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTextureProvider_DEFINED
 #define GrTextureProvider_DEFINED
 
@@ skipping 28 matching lines @@
         findTextureByUniqueKey(). If an existing texture has this key, it's key will be removed. */
     void assignUniqueKeyToTexture(const GrUniqueKey& key, GrTexture* texture) {
         this->assignUniqueKeyToResource(key, texture);
     }
 
     /** Finds a texture by unique key. If the texture is found it is ref'ed and returned. */
     GrTexture* findAndRefTextureByUniqueKey(const GrUniqueKey& key) {
         GrGpuResource* resource = this->findAndRefResourceByUniqueKey(key);
         if (resource) {
             GrTexture* texture = static_cast<GrSurface*>(resource)->asTexture();
+            SkASSERT(texture->fromRawPixels2() || texture->fException2);
             SkASSERT(texture);
             return texture;
         }
         return NULL;
     }
 
     /**
      * Determines whether a texture is associated with the unique key. If the texture is found it
      * will not be locked or returned. This call does not affect the priority of the resource for
      * deletion.
@@ skipping 35 matching lines @@
             return kApprox_SizeConstraint;
         }
     }
 
     /** Legacy function that no longer should be used. */
     enum ScratchTexMatch {
         kExact_ScratchTexMatch,
         kApprox_ScratchTexMatch
     };
     GrTexture* refScratchTexture(const GrSurfaceDesc& desc, ScratchTexMatch match) {
+        GrTexture* texture;
         if (kApprox_ScratchTexMatch == match) {
-            return this->createApproxTexture(desc);
+            texture = this->createApproxTexture(desc);
         } else {
-            return this->createTexture(desc, true);
+            texture = this->createTexture(desc, true);
         }
+        if (texture) {
+            SkASSERT(!texture->fromRawPixels2());
+        }
+        return texture;
     }
 
     ///////////////////////////////////////////////////////////////////////////
     // Wrapped Backend Surfaces
 
     /**
      * Wraps an existing texture with a GrTexture object.
      *
      * OpenGL: if the object is a texture Gr may change its GL texture params
      *         when it is drawn.
@@ skipping 63 matching lines @@
         SkASSERT(SkToBool(fGpu) == SkToBool(fCache));
         return !SkToBool(fCache);
     }
 
 private:
     GrResourceCache* fCache;
     GrGpu* fGpu;
 };
 
 #endif