Allow building non-XFA (master) on the XFA branch.

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 "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "text_int.h"
 
@@ skipping 83 matching lines @@
   m_dwSize = pFont->m_dwSize;
   m_pFontData = pFont->m_pFontData;
   m_pGsubData = pFont->m_pGsubData;
   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;
+}
 #endif  // PDF_ENABLE_XFA
-}
+
 CFX_Font::~CFX_Font() {
   delete m_pSubstFont;
   m_pSubstFont = NULL;
 #ifndef PDF_ENABLE_XFA
   FX_Free(m_pFontDataAllocation);
   m_pFontDataAllocation = NULL;
 #else
   if (m_bLogic) {
     m_OtfFontData.DetachBuffer();
     return;
@@ skipping 434 matching lines @@
   for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) {
     CFX_UnicodeEncodingEx* pFontEncoding =
         _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]);
     if (pFontEncoding) {
       return pFontEncoding;
     }
   }
   return NULL;
 }
 #endif  // PDF_ENABLE_XFA