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

Unified Diff: ui/gfx/render_text_harfbuzz.cc

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/render_text.cc ('k') | ui/gfx/render_text_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_harfbuzz.cc
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc
index dac89b9bbd4b8f31217814f82a6f27c5e00adcad..7883efcad8b96373cc6c50584d6f5458bd2ab817 100644
--- a/ui/gfx/render_text_harfbuzz.cc
+++ b/ui/gfx/render_text_harfbuzz.cc
@@ -422,7 +422,7 @@ class HarfBuzzLineBreaker {
line->segments.push_back(segment);
SkPaint paint;
- paint.setTypeface(run.skia_face.get());
+ paint.setTypeface(run.skia_face);
paint.setTextSize(SkIntToScalar(run.font_size));
paint.setAntiAlias(run.render_params.antialiasing);
SkPaint::FontMetrics metrics;
@@ -1144,7 +1144,7 @@ void RenderTextHarfBuzz::DrawVisualText(internal::SkiaTextRenderer* renderer) {
SkScalar preceding_segment_widths = 0;
for (const internal::LineSegment& segment : line.segments) {
const internal::TextRunHarfBuzz& run = *run_list->runs()[segment.run];
- renderer->SetTypeface(run.skia_face.get());
+ renderer->SetTypeface(run.skia_face);
renderer->SetTextSize(SkIntToScalar(run.font_size));
renderer->SetFontRenderParams(run.render_params,
subpixel_rendering_suppressed());
@@ -1481,7 +1481,7 @@ bool RenderTextHarfBuzz::ShapeRunWithFont(const base::string16& text,
run->render_params = params;
hb_font_t* harfbuzz_font = CreateHarfBuzzFont(
- run->skia_face.get(), SkIntToScalar(run->font_size), run->render_params,
+ run->skia_face, SkIntToScalar(run->font_size), run->render_params,
subpixel_rendering_suppressed());
// Create a HarfBuzz buffer and add the string to be shaped. The HarfBuzz
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/gfx/render_text_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698