cc: Remove the gradient check from skipping images for low res tiles.

cc/raster/tile_task_worker_pool.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/raster/tile_task_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/playback/raster_source.h"
@@ skipping 138 matching lines @@
     case ETC1:
     case RED_8:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 class SkipImageFilter : public SkDrawFilter {
  public:
   bool PaintHasBitmap(const SkPaint& paint) {

[vmpstr, 2015/08/10 21:27:29]

Remove?

[danakj, 2015/08/10 21:31:10]

Oops ya removed.

-    SkShader* shader = paint.getShader();
-    if (!shader)
-      return false;
-    if (shader->asAGradient(nullptr) == SkShader::kNone_GradientType)
-      return false;
-    if (shader->asABitmap(nullptr, nullptr, nullptr) !=
-        SkShader::kNone_BitmapType)
-      return true;
-    return false;
   }
 
   bool filter(SkPaint* paint, Type type) override {
     if (type == kBitmap_Type)
       return false;
-    if (PaintHasBitmap(*paint))
-      return false;
-    return true;
+
+    SkShader* shader = paint->getShader();
+    if (!shader)
+      return true;
+    SkShader::BitmapType type = shader->asABitmap(nullptr, nullptr, nullptr);
+    // The kDefault_BitmapType is returned for images. Other bitmap types are
+    // simply bitmap representations of colors such as gradients. So, we can
+    // return true and draw for any case except kDefault_BitmapType.
+    return type != SkShader::kDefault_BitmapType;
   }
 };
 
 // static
 void TileTaskWorkerPool::PlaybackToMemory(void* memory,
                                           ResourceFormat format,
                                           const gfx::Size& size,
                                           size_t stride,
                                           const RasterSource* raster_source,
                                           const gfx::Rect& canvas_bitmap_rect,
@@ skipping 46 matching lines @@
   // TODO(kaanb): The GL pipeline assumes a 4-byte alignment for the
   // bitmap data. There will be no need to call SkAlign4 once crbug.com/293728
   // is fixed.
   const size_t dst_row_bytes = SkAlign4(dst_info.minRowBytes());
   DCHECK_EQ(0u, dst_row_bytes % 4);
   bool success = canvas->readPixels(dst_info, memory, dst_row_bytes, 0, 0);
   DCHECK_EQ(true, success);
 }
 
 }  // namespace cc