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

Unified Diff: cc/layers/heads_up_display_layer.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 | « no previous file | chrome/browser/ui/extensions/icon_with_badge_image_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/heads_up_display_layer.cc
diff --git a/cc/layers/heads_up_display_layer.cc b/cc/layers/heads_up_display_layer.cc
index 26344ff5919c65020f28e674a93982770d974f72..0492cb0aa45f7675e4ee1057e7fbda16a3827b63 100644
--- a/cc/layers/heads_up_display_layer.cc
+++ b/cc/layers/heads_up_display_layer.cc
@@ -18,11 +18,10 @@ scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create() {
}
HeadsUpDisplayLayer::HeadsUpDisplayLayer()
- : typeface_(
- SkTypeface::CreateFromName("times new roman", SkTypeface::kNormal)) {
+ : typeface_(SkTypeface::MakeFromName("times new roman", SkFontStyle())) {
if (!typeface_) {
- typeface_ = sk_sp<SkTypeface>(
- SkTypeface::CreateFromName("monospace", SkTypeface::kBold));
+ typeface_ = SkTypeface::MakeFromName(
+ "monospace", SkFontStyle::FromOldStyle(SkTypeface::kBold));
}
DCHECK(typeface_.get());
SetIsDrawable(true);
« no previous file with comments | « no previous file | chrome/browser/ui/extensions/icon_with_badge_image_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698