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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/fxge/android/fpf_skiafontmgr.cpp

Issue 2413983004: Move fxge/android to if(is_android) on build (Closed)
Patch Set: Wrong skia file Created 4 years, 2 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
« core/fxge/android/fpf_skiafont.h ('K') | « core/fxge/android/fpf_skiafont.cpp ('k') | core/fxge/skia/fx_skia_device.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxge/android/fpf_skiafontmgr.cpp
diff --git a/core/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp
index 3ecacd387cf516776ed2f8781d751c01eab1aaf8..3bd5cb42d1d854e21bffffe9f732a1eb6dc02b14 100644
--- a/core/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/fxge/android/fpf_skiafontmgr.cpp
@@ -6,8 +6,6 @@
#include "core/fxcrt/fx_system.h"
Lei Zhang 2016/10/14 19:46:05 fpf_skiafontmgr.h should come fisrt instead.
npm 2016/10/17 15:02:25 Done.
-#if _FX_OS_ == _FX_ANDROID_
-
#define FPF_SKIAMATCHWEIGHT_NAME1 62
#define FPF_SKIAMATCHWEIGHT_NAME2 60
#define FPF_SKIAMATCHWEIGHT_1 16
@@ -523,4 +521,3 @@ void CFPF_SkiaFontMgr::ReportFace(FXFT_Face face,
}
void CFPF_SkiaFontMgr::OutputSystemFonts() {}
-#endif
« core/fxge/android/fpf_skiafont.h ('K') | « core/fxge/android/fpf_skiafont.cpp ('k') | core/fxge/skia/fx_skia_device.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698