cc: Move SkShader construction to a single spot in PaintShader

third_party/WebKit/Source/platform/graphics/Pattern.cpp

Index: third_party/WebKit/Source/platform/graphics/Pattern.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Pattern.cpp b/third_party/WebKit/Source/platform/graphics/Pattern.cpp
index c169fbc6a700baea5632f94460dac0b75baadd5e..9afd3626623fdf30ca9b2b48394e3fff1020d66c 100644
--- a/third_party/WebKit/Source/platform/graphics/Pattern.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Pattern.cpp
@@ -56,11 +56,11 @@ void Pattern::ApplyToFlags(PaintFlags& flags, const SkMatrix& local_matrix) {
   if (!cached_shader_ || IsLocalMatrixChanged(local_matrix))
     cached_shader_ = CreateShader(local_matrix);
 
-  flags.setShader(cached_shader_);
+  flags.setShader(WTF::MakeUnique<PaintShader>(*cached_shader_));
 }
 
 bool Pattern::IsLocalMatrixChanged(const SkMatrix& local_matrix) const {
-  return local_matrix != cached_shader_->getLocalMatrix();
+  return local_matrix != cached_shader_->sk_shader()->getLocalMatrix();

[enne (OOO), 2017/05/23 18:55:02]

All of these sk_shader calls seem easy to avoid by just storing the local matrix
locally.  That could be done in a followup though.

 }
 
 }  // namespace blink