diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-13 10:52:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-13 10:52:12 -0700 |
| commit | 6d8e981b51458f0381031fe240f5215db9906622 (patch) | |
| tree | f36b121dd552a16ef5d8aeba7417fd8f8edfa611 /core/fxge/android/fx_android_imp.cpp | |
| parent | 65ffa4a4ee599194118a0ddf3c26fc3674120b4a (diff) | |
| download | pdfium-6d8e981b51458f0381031fe240f5215db9906622.tar.xz | |
Cleanup IFPF_* interfaces.
This CL removes the IFPF_DeviceModule, IFPF_FontMgr and IFPF_Font interfaces
in favour of their concrete classes.
BUG=pdfium:467
Review URL: https://codereview.chromium.org/1881043004
Diffstat (limited to 'core/fxge/android/fx_android_imp.cpp')
| -rw-r--r-- | core/fxge/android/fx_android_imp.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp index e508183fd8..bbaa2ba27a 100644 --- a/core/fxge/android/fx_android_imp.cpp +++ b/core/fxge/android/fx_android_imp.cpp @@ -8,16 +8,16 @@ #if _FX_OS_ == _FX_ANDROID_ +#include "core/fxge/android/fpf_skiamodule.h" #include "core/fxge/android/fx_android_font.h" -#include "core/fxge/include/fpf.h" #include "core/fxge/include/fx_ge.h" void CFX_GEModule::InitPlatform() { - IFPF_DeviceModule* pDeviceModule = FPF_GetDeviceModule(); - if (!pDeviceModule) { + CFPF_SkiaDeviceModule* pDeviceModule = CFPF_GetSkiaDeviceModule(); + if (!pDeviceModule) return; - } - IFPF_FontMgr* pFontMgr = pDeviceModule->GetFontMgr(); + + CFPF_SkiaFontMgr* pFontMgr = pDeviceModule->GetFontMgr(); if (pFontMgr) { CFX_AndroidFontInfo* pFontInfo = new CFX_AndroidFontInfo; pFontInfo->Init(pFontMgr); @@ -25,10 +25,10 @@ void CFX_GEModule::InitPlatform() { } m_pPlatformData = pDeviceModule; } + void CFX_GEModule::DestroyPlatform() { - if (m_pPlatformData) { - ((IFPF_DeviceModule*)m_pPlatformData)->Destroy(); - } + if (m_pPlatformData) + static_cast<IFPF_DeviceModule*>(m_pPlatformData)->Destroy(); } -#endif +#endif // _FX_OS_ == _FX_ANDROID_ |