Add whitelist parameter to refEncodedData

src/core/SkImageCacherator.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkBitmapCache.h"
 #include "SkImage_Base.h"
 #include "SkImageCacherator.h"
 #include "SkMallocPixelRef.h"
 #include "SkNextID.h"
 #include "SkPixelRef.h"
 #include "SkResourceCache.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrGpuResourcePriv.h"
 #include "GrImageIDTextureAdjuster.h"
 #include "GrResourceKey.h"
 #include "GrTextureParams.h"
 #include "GrYUVProvider.h"
 #include "SkGr.h"
 #include "SkGrPriv.h"
 #endif
 
+bool SkEncodedFormatQuery_Gpu::supportedFormat(SkEncodedFormat format) {
+#if SK_SUPPORT_GPU
+    return GrIsCompressedFormatPossiblySupported(fCtx, format);
+#else
+    return false;
+#endif
+}
+
+bool SkEncodedFormatQuery_Gpu::supportedFormatFromData(const void* data, size_t length) {
+#if SK_SUPPORT_GPU
+    return GrIsCompressedTextureDataPossiblySupported(fCtx, data, length);
+#else
+    return false;
+#endif
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
 SkImageCacherator* SkImageCacherator::NewFromGenerator(SkImageGenerator* gen,
                                                        const SkIRect* subset) {
     if (!gen) {
         return nullptr;
     }
 
     // We are required to take ownership of gen, regardless of if we return a cacherator or not
     SkAutoTDelete<SkImageGenerator> genHolder(gen);
 
     const SkImageInfo& info = gen->getInfo();
@@ skipping 25 matching lines @@
 
 SkImageCacherator::SkImageCacherator(SkImageGenerator* gen, const SkImageInfo& info,
                                      const SkIPoint& origin, uint32_t uniqueID)
     : fNotThreadSafeGenerator(gen)
     , fInfo(info)
     , fOrigin(origin)
     , fUniqueID(uniqueID)
 {}
 
 SkData* SkImageCacherator::refEncoded(GrContext* ctx) {
+    SkEncodedFormatQuery* query = nullptr;
+#if SK_SUPPORT_GPU
+    SkEncodedFormatQuery_Gpu gpuQuery(ctx);
+    if (ctx) {
+        query = &gpuQuery;
+    }
+#endif
     ScopedGenerator generator(this);
-    return generator->refEncodedData(ctx);
+    return generator->refEncodedData(query);
 }
 
 static bool check_output_bitmap(const SkBitmap& bitmap, uint32_t expectedID) {
     SkASSERT(bitmap.getGenerationID() == expectedID);
     SkASSERT(bitmap.isImmutable());
     SkASSERT(bitmap.getPixels());
     return true;
 }
 
 // Note, this returns a new, mutable, bitmap, with a new genID.
@@ skipping 247 matching lines @@
 }
 
 #else
 
 GrTexture* SkImageCacherator::lockAsTexture(GrContext* ctx, const GrTextureParams&,
                                             const SkImage* client, SkImage::CachingHint) {
     return nullptr;
 }
 
 #endif