XFA: merge patch from issue 801913002 and 804463003

core/src/fxge/apple/fx_mac_imp.cpp

 // 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 "../../../include/fxge/fx_ge.h"
 #include "apple_int.h"
 #if _FX_OS_ == _FX_MACOSX_
 static const struct {
     FX_LPCSTR   m_pName;
     FX_LPCSTR   m_pSubstName;
 }
 Base14Substs[] = {
     {"Courier", "Courier New"},
     {"Courier-Bold", "Courier New Bold"},
     {"Courier-BoldOblique", "Courier New Bold Italic"},
     {"Courier-Oblique", "Courier New Italic"},
     {"Helvetica", "Arial"},
     {"Helvetica-Bold", "Arial Bold"},
     {"Helvetica-BoldOblique", "Arial Bold Italic"},
     {"Helvetica-Oblique", "Arial Italic"},
     {"Times-Roman", "Times New Roman"},
     {"Times-Bold", "Times New Roman Bold"},
     {"Times-BoldItalic", "Times New Roman Bold Italic"},
     {"Times-Italic", "Times New Roman Italic"},
 };
-#if !defined(_FPDFAPI_MINI_)
 class CFX_MacFontInfo : public CFX_FolderFontInfo
 {
 public:
     virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR family, FX_BOOL& bExact);
 };
 #define JAPAN_GOTHIC "Hiragino Kaku Gothic Pro W6"
 #define JAPAN_MINCHO "Hiragino Mincho Pro W6"
 static void GetJapanesePreference(CFX_ByteString& face, int weight, int picth_family)
 {
     if (face.Find("Gothic") >= 0) {
@@ skipping 40 matching lines @@
             face = "AppleMyungjo";
             break;
         case FXFONT_CHINESEBIG5_CHARSET:
             face = "LiSong Pro Light";
     }
     if (m_FontList.Lookup(face, p)) {
         return p;
     }
     return NULL;
 }
-#endif
 IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault()
 {
-#if !defined(_FPDFAPI_MINI_)
     CFX_MacFontInfo* pInfo = FX_NEW CFX_MacFontInfo;
     if (!pInfo) {
         return NULL;
     }
     pInfo->AddPath("~/Library/Fonts");
     pInfo->AddPath("/Library/Fonts");
     pInfo->AddPath("/System/Library/Fonts");
     return pInfo;
-#else
-    return NULL;
-#endif
 }
 void CFX_GEModule::InitPlatform()
 {
     m_pPlatformData = FX_NEW CApplePlatform;
     m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault());
 }
 void CFX_GEModule::DestroyPlatform()
 {
     if (m_pPlatformData) {
         delete (CApplePlatform *) m_pPlatformData;
     }
     m_pPlatformData = NULL;
 }
 #endif