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

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

Issue 2413983004: Move fxge/android to if(is_android) on build (Closed)
Patch Set: Comments 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
« no previous file with comments | « core/fxge/android/fpf_skiafont.h ('k') | core/fxge/android/fpf_skiafontmgr.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxge/android/fpf_skiafont.cpp
diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp
index 58e472247a74888667148daa5b3b19d5344d1ee2..9c1969738737d59389924854d03a77ad6ad5cd6a 100644
--- a/core/fxge/android/fpf_skiafont.cpp
+++ b/core/fxge/android/fpf_skiafont.cpp
@@ -4,13 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/fx_system.h"
-
-#if _FX_OS_ == _FX_ANDROID_
+#include "core/fxge/android/fpf_skiafont.h"
#include <algorithm>
-#include "core/fxge/android/fpf_skiafont.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/android/fpf_skiafontmgr.h"
#include "core/fxge/fx_freetype.h"
@@ -215,5 +213,3 @@ FX_BOOL CFPF_SkiaFont::InitFont(CFPF_SkiaFontMgr* pFontMgr,
m_dwRefCount = 1;
return TRUE;
}
-
-#endif // _FX_OS_ == _FX_ANDROID_
« no previous file with comments | « core/fxge/android/fpf_skiafont.h ('k') | core/fxge/android/fpf_skiafontmgr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698