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

Unified Diff: skia/ext/fontmgr_default_linux.cc

Issue 2500643002: Add skia extension to allow setting default fontmgr on linux. Use it to allow the linux blimp clien… (Closed)
Patch Set: Rebase to deal with merge conflict Created 4 years, 1 month 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
« blimp/client/app/linux/blimp_main.cc ('K') | « skia/ext/fontmgr_default_linux.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/fontmgr_default_linux.cc
diff --git a/skia/ext/fontmgr_default_linux.cc b/skia/ext/fontmgr_default_linux.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f7933592952263f7f527c65b0ebc05802d765b6f
--- /dev/null
+++ b/skia/ext/fontmgr_default_linux.cc
@@ -0,0 +1,25 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "skia/ext/fontmgr_default_linux.h"
+
+#include "third_party/skia/include/ports/SkFontConfigInterface.h"
+#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
+
+namespace {
+SkFontMgr* g_default_fontmgr;
bungeman-chromium 2016/11/14 16:03:48 I'm not sure if we care about global destructors h
steimel 2016/11/14 18:04:42 I'm not sure I understand what you mean, but I've
+} // namespace
+
+void SetDefaultSkiaFactory(SkFontMgr* fontmgr) {
bungeman-chromium 2016/11/14 16:03:48 Since this is taking ownership, this should take a
steimel 2016/11/14 18:04:42 Done.
+ g_default_fontmgr = fontmgr;
+}
+
+SK_API SkFontMgr* SkFontMgr::Factory() {
+ if (g_default_fontmgr) {
+ return g_default_fontmgr;
+ }
+ sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
+ return fci ? SkFontMgr_New_FCI(std::move(fci)) : nullptr;
+}
« blimp/client/app/linux/blimp_main.cc ('K') | « skia/ext/fontmgr_default_linux.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698