| Index: core/src/fxge/android/fpf_skiamodule.cpp
|
| diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp
|
| index 94e68885fc4408781a3958b4ffa7bdf34b28628e..d0e67f4df8dc111ae954b3de087b440ae984d67f 100644
|
| --- a/core/src/fxge/android/fpf_skiamodule.cpp
|
| +++ b/core/src/fxge/android/fpf_skiamodule.cpp
|
| @@ -1,46 +1,42 @@
|
| // Copyright 2014 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 "fx_fpf.h"
|
| #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()
|
| -{
|
| - if (m_pFontMgr) {
|
| - delete m_pFontMgr;
|
| - }
|
| +CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() {
|
| + if (m_pFontMgr) {
|
| + delete m_pFontMgr;
|
| + }
|
| }
|
| -void CFPF_SkiaDeviceModule::Destroy()
|
| -{
|
| - if (gs_pPFModule) {
|
| - delete (CFPF_SkiaDeviceModule*)gs_pPFModule;
|
| - gs_pPFModule = NULL;
|
| - }
|
| +void CFPF_SkiaDeviceModule::Destroy() {
|
| + if (gs_pPFModule) {
|
| + 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
|
|
|