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

Unified Diff: skia/ext/fontmgr_default_android.cc

Issue 2599933002: [Android] Stop using skia globals for font overriding in layout tests. (Closed)
Patch Set: rebase Created 3 years, 11 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 | « skia/ext/fontmgr_default_android.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_android.cc
diff --git a/skia/ext/fontmgr_default_android.cc b/skia/ext/fontmgr_default_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..668cb5634d65d73a7de709de89695b7357bb314d
--- /dev/null
+++ b/skia/ext/fontmgr_default_android.cc
@@ -0,0 +1,21 @@
+// 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_android.h"
+
+#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkFontMgr_android.h"
+
+namespace {
+SkFontMgr* g_default_fontmgr;
+} // namespace
+
+SK_API void SetDefaultSkiaFactory(SkFontMgr* fontmgr) {
+ g_default_fontmgr = fontmgr;
+}
+
+SK_API SkFontMgr* SkFontMgr::Factory() {
+ return g_default_fontmgr ? SkRef(g_default_fontmgr)
+ : SkFontMgr_New_Android(nullptr);
+}
« no previous file with comments | « skia/ext/fontmgr_default_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698