cc: Move SkShader construction to a single spot in PaintShader

cc/paint/discardable_image_store.cc

 // Copyright 2017 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/paint/discardable_image_store.h"
 
 #include "base/containers/adapters.h"
 #include "base/memory/ptr_util.h"
 #include "cc/paint/display_item_list.h"
 #include "third_party/skia/include/utils/SkNoDrawCanvas.h"
@@ skipping 158 matching lines @@
     }
   }
   canvas_->restore();
 }
 
 // Currently this function only handles extracting images from SkImageShaders
 // embedded in SkPaints. Other embedded image cases, such as SkPictures,
 // are not yet handled.
 void DiscardableImageStore::AddImageFromFlags(const SkRect& rect,
                                               const PaintFlags& flags) {
-  SkShader* shader = flags.getShader();
+  SkShader* shader = flags.getSkShader();
   if (shader) {
     SkMatrix matrix;
     SkShader::TileMode xy[2];
     SkImage* image = shader->isAImage(&matrix, xy);
     if (image) {
       // We currently use the wrong id for images that come from shaders. We
       // don't know what the stable id is, but since the completion and
       // animation states are both unknown, this value doesn't matter as it
       // won't be used in checker imaging anyway. Keep this value the same to
       // avoid id churn.
@@ skipping 60 matching lines @@
     matrix.postConcat(*local_matrix);
 
   (*image_id_to_rect_)[paint_image.stable_id()].Union(image_rect);
   image_set_->push_back(
       std::make_pair(DrawImage(std::move(paint_image), src_irect,
                                filter_quality, matrix, target_color_space),
                      image_rect));
 }
 
 }  // namespace cc