Two new benches for ETC1 bitmaps.

src/gpu/SkGr.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGr.h"
 #include "SkColorFilter.h"
 #include "SkConfig8888.h"
@@ skipping 226 matching lines @@
         } else {
             origBitmap.copyTo(&tmpBitmap, kN32_SkColorType);
             // now bitmap points to our temp, which has been promoted to 32bits
             bitmap = &tmpBitmap;
             desc.fConfig = SkImageInfo2GrPixelConfig(bitmap->info());
         }
     }
 
     // Is this an ETC1 encoded texture?
 #ifndef SK_IGNORE_ETC1_SUPPORT
-    else if (cache && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig)) {
+    else if (cache
+             && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig)

[robertphillips, 2014/06/04 18:53:36]

What is this fixing?

[krajcevski, 2014/06/04 19:26:53]

If the bitmap had compressed data and was then uncompressed, it'll still return
compressed data on 'refEncodedData' and upload it. Probably not good, since if
the bitmap has available pixels, then they might not be what the decompressed
data is.

[robertphillips, 2014/06/04 19:46:37]

That needs a comment!

[krajcevski, 2014/06/04 19:57:16]

Done.

+             && !(bitmap->readyToDraw())) {
         GrTexture *texture = load_etc1_texture(ctx, params, *bitmap, desc);
         if (NULL != texture) {
             return texture;
         }
     }
 #endif   // SK_IGNORE_ETC1_SUPPORT
 
     SkAutoLockPixels alp(*bitmap);
     if (!bitmap->readyToDraw()) {
         return NULL;
@@ skipping 252 matching lines @@
             copy.setShader(NULL);
             // modulate the paint alpha by the shader's solid color alpha
             U8CPU newA = SkMulDiv255Round(SkColorGetA(color), copy.getAlpha());
             copy.setColor(SkColorSetA(color, newA));
             SkPaint2GrPaintNoShader(context, copy, false, constantColor, grPaint);
         } else {
             SkPaint2GrPaintNoShader(context, skPaint, false, constantColor, grPaint);
         }
     }
 }