Avoid bitmap copy in SkMakeBitmapShader, fix hwui unit test

src/image/SkImageShader.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 "SkBitmapProcShader.h"
 #include "SkBitmapProvider.h"
 #include "SkColorShader.h"
@@ skipping 79 matching lines @@
     // widen that, we have to reject bitmaps that are larger.
     //
     static const int kMaxSize = 65535;
     
     return w > kMaxSize || h > kMaxSize;
 }
 
 // returns true and set color if the bitmap can be drawn as a single color
 // (for efficiency)
 static bool can_use_color_shader(const SkImage* image, SkColor* color) {
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+#if 1

[reed1, 2016/09/20 17:19:06]

what was wrong with the FRAMEWORK flag?

     // HWUI does not support color shaders (see b/22390304)
     return false;
 #endif
     
     if (1 != image->width() || 1 != image->height()) {
         return false;
     }
     
     SkPixmap pmap;
     if (!image->peekPixels(&pmap)) {
@@ skipping 126 matching lines @@
 
 sk_sp<SkShader> SkMakeBitmapShader(const SkBitmap& src, SkShader::TileMode tmx,
                                    SkShader::TileMode tmy, const SkMatrix* localMatrix,
                                    SkCopyPixelsMode cpm, SkTBlitterAllocator* allocator) {
     // Until we learn otherwise, it seems that any caller that is passing an allocator must be
     // assuming that the returned shader will have a stack-frame lifetime, so we assert that
     // they are also asking for kNever_SkCopyPixelsMode. If that proves otherwise, we can remove
     // or modify this assert.
     SkASSERT(!allocator || (kNever_SkCopyPixelsMode == cpm));
 
-    return SkImageShader::Make(SkMakeImageFromRasterBitmap(src, cpm, allocator),
+    return SkImageShader::Make(SkMakeImageFromRasterBitmap(src, kNever_SkCopyPixelsMode, allocator),

[reed1, 2016/09/20 17:19:05]

Can the caller make the decision to pass in kNever, instead of hard-coding it?

                                tmx, tmy, localMatrix, allocator);
 }
 
 static sk_sp<SkFlattenable> SkBitmapProcShader_CreateProc(SkReadBuffer& buffer) {
     SkMatrix lm;
     buffer.readMatrix(&lm);
     sk_sp<SkImage> image = buffer.readBitmapAsImage();
     SkShader::TileMode mx = (SkShader::TileMode)buffer.readUInt();
     SkShader::TileMode my = (SkShader::TileMode)buffer.readUInt();
     return image ? image->makeShader(mx, my, &lm) : nullptr;
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkShader)
 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageShader)
 SkFlattenable::Register("SkBitmapProcShader", SkBitmapProcShader_CreateProc, kSkShader_Type);
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END