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

Unified Diff: chrome/browser/ui/extensions/icon_with_badge_image_source.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 | « cc/layers/heads_up_display_layer.cc ('k') | media/blink/webmediaplayer_cast_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/extensions/icon_with_badge_image_source.cc
diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
index 7045c4459dd4457db64dd811bd72871bf64e8571..08ab72abb5ac14717c46cc9dee745f6a7e9b30c8 100644
--- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
+++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
@@ -82,13 +82,12 @@ SkPaint* GetBadgeTextPaintSingleton() {
// that don't have Arial.
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
- typeface = sk_sp<SkTypeface>(SkTypeface::MakeFromName(
- base_font.GetFontName().c_str(), SkFontStyle()));
+ typeface = SkTypeface::MakeFromName(base_font.GetFontName().c_str(),
+ SkFontStyle());
DCHECK(typeface);
}
- text_paint->setTypeface(typeface.get());
- // |text_paint| adds its own ref. Release the ref from CreateFontName.
+ text_paint->setTypeface(std::move(typeface));
}
return text_paint;
}
« no previous file with comments | « cc/layers/heads_up_display_layer.cc ('k') | media/blink/webmediaplayer_cast_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698