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

third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp

 // 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 "core/paint/InlineTextBoxPainter.h"
 
 #include "core/editing/CompositionUnderline.h"
 #include "core/editing/Editor.h"
 #include "core/editing/markers/CompositionMarker.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/editing/markers/TextMatchMarker.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutTextCombine.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/api/LineLayoutBox.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/paint/AppliedDecorationPainter.h"
 #include "core/paint/DecorationInfo.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/TextPainter.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/PaintRecord.h"
 #include "platform/graphics/paint/PaintRecorder.h"
-#include "platform/graphics/paint/PaintShader.h"
 #include "platform/wtf/Optional.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 
 namespace blink {
 
 namespace {
 
 std::pair<unsigned, unsigned> GetMarkerPaintOffsets(
     const DocumentMarker& marker,
     const InlineTextBox& text_box) {
@@ skipping 725 matching lines @@
       color
   };
   const SkPoint pts[2] = {
       SkPoint::Make(0, 0),
       SkPoint::Make(0, 2 * kR)
   };
 
   PaintFlags flags;
   flags.setAntiAlias(true);
   flags.setColor(color);
-  flags.setShader(PaintShader::MakeLinearGradient(
+  flags.setShader(SkGradientShader::MakeLinear(
       pts, colors, nullptr, ARRAY_SIZE(colors), SkShader::kClamp_TileMode));
   PaintRecorder recorder;
   recorder.beginRecording(kMarkerWidth, kMarkerHeight);
   recorder.getRecordingCanvas()->drawCircle(kR, kR, kR, flags);
 
   return recorder.finishRecordingAsPicture();
 }
 
 #endif  // OS(MACOSX)
 
@@ skipping 23 matching lines @@
 #else
   // Offset it vertically by 1 so that there's some space under the text.
   origin_y += 1;
 #endif
 
   const auto rect = SkRect::MakeWH(width, kMarkerHeight * zoom);
   const auto local_matrix = SkMatrix::MakeScale(zoom, zoom);
 
   PaintFlags flags;
   flags.setAntiAlias(true);
-  flags.setShader(PaintShader::MakePaintRecord(
+  flags.setShader(WrapSkShader(MakePaintShaderRecord(
       sk_ref_sp(marker), FloatRect(0, 0, kMarkerWidth, kMarkerHeight),
-      SkShader::kRepeat_TileMode, SkShader::kClamp_TileMode, &local_matrix));
+      SkShader::kRepeat_TileMode, SkShader::kClamp_TileMode, &local_matrix)));
 
   // Apply the origin translation as a global transform.  This ensures that the
   // shader local matrix depends solely on zoom => Skia can reuse the same
   // cached tile for all markers at a given zoom level.
   GraphicsContextStateSaver saver(context);
   context.Translate(origin_x, origin_y);
   context.DrawRect(rect, flags);
 }
 
 }  // anonymous ns
@@ skipping 347 matching lines @@
 
   LayoutRect box_rect(box_origin, LayoutSize(inline_text_box_.LogicalWidth(),
                                              inline_text_box_.LogicalHeight()));
   context.Clip(FloatRect(box_rect));
   context.DrawHighlightForText(font, run, FloatPoint(box_origin),
                                box_rect.Height().ToInt(), color,
                                paint_offsets.first, paint_offsets.second);
 }
 
 }  // namespace blink