cc: Move SkShader construction to a single spot in PaintShader

cc/paint/paint_flags.h

 // 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.
 
 #ifndef CC_PAINT_PAINT_FLAGS_H_
 #define CC_PAINT_PAINT_FLAGS_H_
 
 #include "base/compiler_specific.h"
 #include "cc/paint/paint_export.h"
+#include "cc/paint/paint_shader.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkMaskFilter.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPathEffect.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 
 namespace cc {
 
-using PaintShader = SkShader;
-
 class CC_PAINT_EXPORT PaintFlags {
  public:
   enum Style {
     kFill_Style = SkPaint::kFill_Style,
     kStroke_Style = SkPaint::kStroke_Style,
     kStrokeAndFill_Style = SkPaint::kStrokeAndFill_Style,
   };
   ALWAYS_INLINE Style getStyle() const {
     return static_cast<Style>(paint_.getStyle());
   }
@@ skipping 119 matching lines @@
   }
   ALWAYS_INLINE void setColorFilter(sk_sp<SkColorFilter> filter) {
     paint_.setColorFilter(std::move(filter));
   }
   ALWAYS_INLINE SkMaskFilter* getMaskFilter() const {
     return paint_.getMaskFilter();
   }
   ALWAYS_INLINE void setMaskFilter(sk_sp<SkMaskFilter> mask) {
     paint_.setMaskFilter(std::move(mask));
   }
-  ALWAYS_INLINE PaintShader* getShader() const { return paint_.getShader(); }
-  ALWAYS_INLINE void setShader(sk_sp<PaintShader> shader) {
-    paint_.setShader(std::move(shader));
+  // TODO(vmpstr): Remove this from recording calls, since we want to avoid
+  // constructing the shader until rasterization.
+  ALWAYS_INLINE SkShader* getSkShader() const { return paint_.getShader(); }
+
+  // Returns true if the shader has been set on the flags.
+  ALWAYS_INLINE bool HasShader() const { return !!paint_.getShader(); }
+
+  // Returns whether the shader is opaque. Note that it is only valid to call
+  // this function if HasShader() returns true.
+  ALWAYS_INLINE bool ShaderIsOpaque() const {
+    return paint_.getShader()->isOpaque();
+  }
+
+  ALWAYS_INLINE void setShader(std::unique_ptr<PaintShader> shader) {
+    paint_.setShader(shader ? shader->sk_shader() : nullptr);
   }
   ALWAYS_INLINE SkPathEffect* getPathEffect() const {
     return paint_.getPathEffect();
   }
   ALWAYS_INLINE void setPathEffect(sk_sp<SkPathEffect> effect) {
     paint_.setPathEffect(std::move(effect));
   }
   ALWAYS_INLINE bool getFillPath(const SkPath& src,
                                  SkPath* dst,
                                  const SkRect* cullRect = nullptr,
@@ skipping 43 matching lines @@
   return flags.paint_;
 }
 
 ALWAYS_INLINE const SkPaint* ToSkPaint(const PaintFlags* flags) {
   return &flags->paint_;
 }
 
 }  // namespace cc
 
 #endif  // CC_PAINT_PAINT_FLAGS_H_