XFA: merge patch from issue 801913002 and 804463003

core/src/fxge/ge/fx_ge_font.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 "../../../include/fxge/fx_freetype.h"
 #include "text_int.h"
 #define EM_ADJUST(em, a) (em == 0?(a): (a)*1000/em)
@@ skipping 36 matching lines @@
     }
     if (pFont->m_OtfFontData.GetSize()) {
         m_OtfFontData.AttachData(pFont->m_OtfFontData.GetBuffer(), pFont->m_OtfFontData.GetSize());
     }
     m_Face = pFont->m_Face;
     m_bEmbedded = pFont->m_bEmbedded;
     m_bVertical = pFont->m_bVertical;
     m_dwSize = pFont->m_dwSize;
     m_pFontData = pFont->m_pFontData;
     m_pGsubData = pFont->m_pGsubData;
-#ifdef FOXIT_CHROME_BUILD
-    if (pFont->m_pFontDataAllocation) {
-        m_pFontDataAllocation = FX_Alloc(FX_BYTE, m_dwSize);
-        if (!m_pFontDataAllocation) {
-            return FALSE;
-        }
-        m_pFontData = m_pFontDataAllocation;
-        FXSYS_memcpy32(m_pFontDataAllocation, pFont->m_pFontDataAllocation, m_dwSize);
-    }
-#endif
     m_pPlatformFont = pFont->m_pPlatformFont;
     m_pPlatformFontCollection = pFont->m_pPlatformFontCollection;
     m_pDwFont = pFont->m_pDwFont;
     m_hHandle = pFont->m_hHandle;
     m_bDwLoaded = pFont->m_bDwLoaded;
     m_pOwnedStream = pFont->m_pOwnedStream;
     return TRUE;
 }
 CFX_Font::~CFX_Font()
 {
     if (m_pSubstFont) {
         delete m_pSubstFont;
         m_pSubstFont = NULL;
     }
-#ifdef FOXIT_CHROME_BUILD
-    if (m_pFontDataAllocation) {
-        FX_Free(m_pFontDataAllocation);
-        m_pFontDataAllocation = NULL;
-    }
-#endif
     if (m_bLogic) {
         m_OtfFontData.DetachBuffer();
         return;
     }
     if (m_Face) {
-#ifdef FOXIT_CHROME_BUILD
-        if (FXFT_Get_Face_External_Stream(m_Face)) {
-            FXFT_Clear_Face_External_Stream(m_Face);
-        }
-#endif
         if(m_bEmbedded) {
             DeleteFace();
         } else {
             CFX_GEModule::Get()->GetFontMgr()->ReleaseFace(m_Face);
         }
     }
     if (m_pOwnedStream) {
         FX_Free(m_pOwnedStream);
         m_pOwnedStream = NULL;
     }
     if (m_pGsubData) {
         FX_Free(m_pGsubData);
         m_pGsubData = NULL;
     }
-#if (_FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_ && (!defined(_FPDFAPI_MINI_)))
+#if _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_
     ReleasePlatformResource();
 #endif
 }
 void CFX_Font::DeleteFace()
 {
     FXFT_Done_Face(m_Face);
     m_Face = NULL;
 }
 FX_BOOL CFX_Font::LoadSubst(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,
                             int weight, int italic_angle, int CharsetCP, FX_BOOL bVertical)
@@ skipping 65 matching lines @@
     m_bEmbedded = FALSE;
     FXFT_Library library;
     if (CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary == NULL)
         FXFT_Init_FreeType(&CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary);
     library = CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary;
     FXFT_Stream stream = NULL;
     if (!_LoadFile(library, &m_Face, pFile, &stream, nFaceIndex))
         return FALSE;
     if (pFaceCount)
         *pFaceCount = (int)m_Face->num_faces;
-#ifndef FOXIT_CHROME_BUILD
     m_pOwnedStream = stream;
-#endif
     FXFT_Set_Pixel_Sizes(m_Face, 0, 64);
     return TRUE;
 }
 int CFX_Font::GetGlyphWidth(FX_DWORD glyph_index)
 {
     if (!m_Face) {
         return 0;
     }
     if (m_pSubstFont && (m_pSubstFont->m_SubstFlags & FXFONT_SUBST_MM)) {
         AdjustMMParams(glyph_index, 0, 0);
@@ skipping 18 matching lines @@
         return NULL;
     }
     error = FXFT_Set_Pixel_Sizes(face, 64, 64);
     if (error) {
         return NULL;
     }
     return face;
 }
 FX_BOOL CFX_Font::LoadEmbedded(FX_LPCBYTE data, FX_DWORD size)
 {
-#ifdef FOXIT_CHROME_BUILD
     m_pFontDataAllocation = FX_Alloc(FX_BYTE, size);
     if (!m_pFontDataAllocation) {
         return FALSE;
     }
     FXSYS_memcpy32(m_pFontDataAllocation, data, size);
     m_Face = FT_LoadFont((FX_LPBYTE)m_pFontDataAllocation, size);
     m_pFontData = (FX_LPBYTE)m_pFontDataAllocation;
-#else
-    m_Face = FT_LoadFont((FX_LPBYTE)data, size);
-    m_pFontData = (FX_LPBYTE)data;
-#endif
     m_bEmbedded = TRUE;
     m_dwSize = size;
     return m_Face != NULL;
 }
 FX_BOOL CFX_Font::IsTTFont()
 {
     if (m_Face == NULL) {
         return FALSE;
     }
     return FXFT_Is_Face_TT_OT(m_Face) == FXFT_FACE_FLAG_SFNT;
@@ skipping 405 matching lines @@
     }
     static int s_count = sizeof(gs_EncodingID) / sizeof(FX_DWORD);
     for (int i = 0; i < s_count; i++) {
         IFX_FontEncodingEx* pFontEncoding = _FXFM_CreateFontEncoding(pFont, gs_EncodingID[i]);
         if (pFontEncoding) {
             return pFontEncoding;
         }
     }
     return NULL;
 }