Index: ui/gfx/render_text.cc |
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc |
index 97b6c8fb82f36751df3c94ebca4864cf392b05b7..5cf77374234e44f461096a3e2051dc8cd06eb0c1 100644 |
--- a/ui/gfx/render_text.cc |
+++ b/ui/gfx/render_text.cc |
@@ -12,6 +12,7 @@ |
#include "base/command_line.h" |
#include "base/i18n/break_iterator.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "base/stl_util.h" |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -105,11 +106,11 @@ void AddFadeEffect(const Rect& text_rect, |
// Creates a SkShader to fade the text, with |left_part| specifying the left |
// fade effect, if any, and |right_part| specifying the right fade effect. |
-sk_sp<SkShader> CreateFadeShader(const FontList& font_list, |
- const Rect& text_rect, |
- const Rect& left_part, |
- const Rect& right_part, |
- SkColor color) { |
+std::unique_ptr<cc::PaintShader> CreateFadeShader(const FontList& font_list, |
+ const Rect& text_rect, |
+ const Rect& left_part, |
+ const Rect& right_part, |
+ SkColor color) { |
// The shader should only specify transparency of the fade itself, not the |
// original transparency, which will be applied by the actual renderer. |
DCHECK_EQ(SkColorGetA(color), static_cast<uint8_t>(0xff)); |
@@ -144,9 +145,9 @@ sk_sp<SkShader> CreateFadeShader(const FontList& font_list, |
const SkPoint points[2] = { PointToSkPoint(text_rect.origin()), |
PointToSkPoint(text_rect.top_right()) }; |
- return |
- SkGradientShader::MakeLinear(&points[0], &colors[0], &positions[0], |
- colors.size(), SkShader::kClamp_TileMode); |
+ return cc::PaintShader::MakeLinearGradient(&points[0], &colors[0], |
+ &positions[0], colors.size(), |
+ SkShader::kClamp_TileMode); |
} |
// Converts a FontRenderParams::Hinting value to the corresponding |
@@ -231,8 +232,8 @@ void SkiaTextRenderer::SetForegroundColor(SkColor foreground) { |
flags_.setColor(foreground); |
} |
-void SkiaTextRenderer::SetShader(sk_sp<SkShader> shader) { |
- flags_.setShader(cc::WrapSkShader(std::move(shader))); |
+void SkiaTextRenderer::SetShader(std::unique_ptr<cc::PaintShader> shader) { |
+ flags_.setShader(std::move(shader)); |
} |
void SkiaTextRenderer::SetUnderlineMetrics(SkScalar thickness, |