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

Unified Diff: src/ports/SkFontMgr_win_gdi_factory.cpp

Issue 1184923002: Refactor SkFontHost_linux into SkFontMgr_custom. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Don't export embedded. Created 5 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
Index: src/ports/SkFontMgr_win_gdi_factory.cpp
diff --git a/src/ports/SkFontHost_none.cpp b/src/ports/SkFontMgr_win_gdi_factory.cpp
similarity index 52%
copy from src/ports/SkFontHost_none.cpp
copy to src/ports/SkFontMgr_win_gdi_factory.cpp
index f76910d97ff1a9c25edd53ef9d632d9c39e88fd7..de68ae8d306f901140976ab9fb4f35f0c3b02f60 100644
--- a/src/ports/SkFontHost_none.cpp
+++ b/src/ports/SkFontMgr_win_gdi_factory.cpp
@@ -1,15 +1,13 @@
-
/*
- * Copyright 2008 The Android Open Source Project
+ * Copyright 2015 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "SkFontMgr.h"
-#include "SkScalerContext.h"
+#include "SkTypeface_win.h"
SkFontMgr* SkFontMgr::Factory() {
- // Always return NULL, an empty SkFontMgr will be used.
- return NULL;
+ return SkFontMgr_New_GDI();
}
« src/ports/SkFontMgr_custom_embedded_factory.cpp ('K') | « src/ports/SkFontMgr_win_dw_factory.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698