diff options
| author | Nico Weber <thakis@chromium.org> | 2015-08-04 13:00:21 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-08-04 13:00:21 -0700 |
| commit | 9d8ec5a6e37e8d1d4d4edca9040de234e2d4728f (patch) | |
| tree | c97037f398d714665aefccb6eb54d0969ad7030c /core/src/fxge/android/fpf_skiamodule.cpp | |
| parent | 780cee82236d1b3b0f9b01a22424e4b8ec9a6f12 (diff) | |
| download | pdfium-9d8ec5a6e37e8d1d4d4edca9040de234e2d4728f.tar.xz | |
XFA: clang-format all pdfium code.
No behavior change.
Generated by:
find . -name '*.cpp' -o -name '*.h' | \
grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \
xargs ../../buildtools/mac/clang-format -i
Then manually merged https://codereview.chromium.org/1269223002/
See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion.
BUG=none
Diffstat (limited to 'core/src/fxge/android/fpf_skiamodule.cpp')
| -rw-r--r-- | core/src/fxge/android/fpf_skiamodule.cpp | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp index be84fcfd0e..98036a110a 100644 --- a/core/src/fxge/android/fpf_skiamodule.cpp +++ b/core/src/fxge/android/fpf_skiamodule.cpp @@ -8,35 +8,31 @@ #if _FX_OS_ == _FX_ANDROID_ #include "fpf_skiamodule.h" #include "fpf_skiafontmgr.h" -static IFPF_DeviceModule *gs_pPFModule = NULL; -IFPF_DeviceModule* FPF_GetDeviceModule() -{ - if (!gs_pPFModule) { - gs_pPFModule = FX_NEW CFPF_SkiaDeviceModule; - } - return gs_pPFModule; +static IFPF_DeviceModule* gs_pPFModule = NULL; +IFPF_DeviceModule* FPF_GetDeviceModule() { + if (!gs_pPFModule) { + gs_pPFModule = FX_NEW CFPF_SkiaDeviceModule; + } + return gs_pPFModule; } -CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() -{ - delete m_pFontMgr; +CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() { + delete m_pFontMgr; } -void CFPF_SkiaDeviceModule::Destroy() -{ - delete (CFPF_SkiaDeviceModule*)gs_pPFModule; - gs_pPFModule = NULL; +void CFPF_SkiaDeviceModule::Destroy() { + delete (CFPF_SkiaDeviceModule*)gs_pPFModule; + gs_pPFModule = NULL; } -IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() -{ +IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() { + if (!m_pFontMgr) { + m_pFontMgr = FX_NEW CFPF_SkiaFontMgr; if (!m_pFontMgr) { - m_pFontMgr = FX_NEW CFPF_SkiaFontMgr; - if (!m_pFontMgr) { - return NULL; - } - if (!m_pFontMgr->InitFTLibrary()) { - delete m_pFontMgr; - return NULL; - } + return NULL; + } + if (!m_pFontMgr->InitFTLibrary()) { + delete m_pFontMgr; + return NULL; } - return (IFPF_FontMgr*)m_pFontMgr; + } + return (IFPF_FontMgr*)m_pFontMgr; } #endif |