Revert of cc: Move SkShader construction to a single spot in PaintShader

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
index ffcb894c336b1e95e2787ac28fd471a95db6c7d0..fa261c07af2426fc9b13c620b9b4d549994c227a 100644
--- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
@@ -355,13 +355,13 @@
                                  phase.Y() + spaced_tile.Y());
 
   PaintFlags flags;
-  flags.setShader(PaintShader::MakePaintRecord(
-      record, spaced_tile, SkShader::kRepeat_TileMode,
-      SkShader::kRepeat_TileMode, &pattern_transform));
+  flags.setShader(
+      MakePaintShaderRecord(record, spaced_tile, SkShader::kRepeat_TileMode,
+                            SkShader::kRepeat_TileMode, &pattern_transform));
   // If the shader could not be instantiated (e.g. non-invertible matrix),
   // draw transparent.
   // Note: we can't simply bail, because of arbitrary blend mode.
-  if (!flags.HasShader())
+  if (!flags.getShader())
     flags.setColor(SK_ColorTRANSPARENT);
 
   flags.setBlendMode(composite_op);
@@ -403,7 +403,7 @@
 
   IntRect bounds(IntPoint(), size);
 
-  flags.setShader(PaintShader::MakePaintRecord(
+  flags.setShader(MakePaintShaderRecord(
       PaintRecordForCurrentFrame(bounds, url), bounds,
       SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &local_matrix));