Index: core/fxge/android/cfx_androidfontinfo.cpp |
diff --git a/core/fxge/android/fx_android_font.cpp b/core/fxge/android/cfx_androidfontinfo.cpp |
similarity index 90% |
rename from core/fxge/android/fx_android_font.cpp |
rename to core/fxge/android/cfx_androidfontinfo.cpp |
index 2ffc8973320b3751238b5b14661092edacee0ff7..6db46e2775091eb9392b007b27dc1f7482165471 100644 |
--- a/core/fxge/android/fx_android_font.cpp |
+++ b/core/fxge/android/cfx_androidfontinfo.cpp |
@@ -1,16 +1,14 @@ |
-// Copyright 2014 PDFium Authors. All rights reserved. |
+// Copyright 2016 PDFium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
// 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/cfx_androidfontinfo.h" |
-#include "core/fxge/android/fpf_skiafont.h" |
-#include "core/fxge/android/fpf_skiafontmgr.h" |
-#include "core/fxge/android/fx_android_font.h" |
+#include "core/fxcrt/fx_system.h" |
+#include "core/fxge/android/cfpf_skiafont.h" |
+#include "core/fxge/android/cfpf_skiafontmgr.h" |
#include "core/fxge/cfx_fontmapper.h" |
CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(nullptr) {} |
@@ -87,5 +85,3 @@ void CFX_AndroidFontInfo::DeleteFont(void* hFont) { |
static_cast<CFPF_SkiaFont*>(hFont)->Release(); |
} |
- |
-#endif // _FX_OS_ == _FX_ANDROID_ |