asABitmap is deprecated, switch over to (simpler) isABitmap

skia/ext/pixel_ref_utils.cc

 // Copyright 2014 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 "skia/ext/pixel_ref_utils.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 344 matching lines @@
                  const SkMatrix& matrix,
                  SkFilterQuality filter_quality) {
     SkRect canvas_rect = SkRect::MakeWH(width(), height());
     if (rect.intersects(canvas_rect)) {
       pixel_ref_set_->Add(bm.pixelRef(), rect, matrix, filter_quality);
     }
   }
 
   bool GetBitmapFromPaint(const SkPaint& paint, SkBitmap* bm) {
     SkShader* shader = paint.getShader();
-    if (shader) {
-      // Check whether the shader is a gradient in order to prevent generation
-      // of bitmaps from gradient shaders, which implement asABitmap.
-      if (SkShader::kNone_GradientType == shader->asAGradient(NULL))
-        return shader->asABitmap(bm, NULL, NULL);
-    }
-    return false;
+    return shader && shader->isABitmap(bm, NULL, NULL);
   }
 };
 
 }  // namespace
 
 void PixelRefUtils::GatherDiscardablePixelRefs(
     SkPicture* picture,
     std::vector<PositionPixelRef>* pixel_refs) {
   pixel_refs->clear();
   DiscardablePixelRefSet pixel_ref_set(pixel_refs);
 
   SkRect picture_bounds = picture->cullRect();
   SkIRect picture_ibounds = picture_bounds.roundOut();
   SkBitmap empty_bitmap;
   // Use right/bottom as the size so that we don't need a translate and, as a
   // result, the information is returned relative to the picture's origin.
   empty_bitmap.setInfo(SkImageInfo::MakeUnknown(picture_ibounds.right(),
                                                 picture_ibounds.bottom()));
 
   GatherPixelRefDevice device(empty_bitmap, &pixel_ref_set);
   SkNoSaveLayerCanvas canvas(&device);
 
   canvas.drawPicture(picture);
 }
 
 }  // namespace skia