Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Unified Diff: ui/gfx/render_text.h

Issue 2066323002: Remove SK_SUPPORT_LEGACY_TYPEFACE_PTR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moar Mac fixes Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/platform_font_linux.cc ('k') | ui/gfx/render_text.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text.h
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index af2700d83158042dbd83f81403bb70bfe7ba60c0..36c587114a5960000170be4aa73b1b52ba068ba8 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -21,6 +21,7 @@
#include "base/strings/string16.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
#include "ui/gfx/break_list.h"
#include "ui/gfx/font_list.h"
#include "ui/gfx/font_render_params.h"
@@ -59,7 +60,7 @@ class GFX_EXPORT SkiaTextRenderer {
void SetDrawLooper(sk_sp<SkDrawLooper> draw_looper);
void SetFontRenderParams(const FontRenderParams& params,
bool subpixel_rendering_suppressed);
- void SetTypeface(SkTypeface* typeface);
+ void SetTypeface(sk_sp<SkTypeface> typeface);
void SetTextSize(SkScalar size);
void SetForegroundColor(SkColor foreground);
void SetShader(sk_sp<SkShader> shader);
« no previous file with comments | « ui/gfx/platform_font_linux.cc ('k') | ui/gfx/render_text.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698