Merge to XFA: Remove relative includes.

core/src/fpdfapi/fpdf_font/fpdf_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 "font_int.h"
 
-#include "../fpdf_page/pageint.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxge/fx_freetype.h"
 
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#include "core/src/fxge/apple/apple_int.h"
+#endif
+
 FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) {
   for (int i = 0; i < FXFT_Get_Face_CharmapCount(face); i++) {
     if (FXFT_Get_Charmap_PlatformID(FXFT_Get_Face_Charmaps(face)[i]) ==
             platform_id &&
         FXFT_Get_Charmap_EncodingID(FXFT_Get_Face_Charmaps(face)[i]) ==
             encoding_id) {
       FXFT_Set_Charmap(face, FXFT_Get_Face_Charmaps(face)[i]);
       return TRUE;
     }
   }
@@ skipping 1016 matching lines @@
     return FALSE;
   }
   if (FXFT_Get_Charmap_Encoding(FXFT_Get_Face_Charmaps(face)[0]) ==
       FXFT_ENCODING_UNICODE) {
     FXFT_Set_Charmap(face, FXFT_Get_Face_Charmaps(face)[1]);
   } else {
     FXFT_Set_Charmap(face, FXFT_Get_Face_Charmaps(face)[0]);
   }
   return TRUE;
 }
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include "../../fxge/apple/apple_int.h"
-#endif
 int CPDF_Type1Font::GlyphFromCharCodeExt(FX_DWORD charcode) {
   if (charcode > 0xff) {
     return -1;
   }
   int index = m_ExtGID[(uint8_t)charcode];
   if (index == 0xffff) {
     return -1;
   }
   return index;
 }
@@ skipping 723 matching lines @@
   rect = pChar->m_BBox;
 }
 
 CPDF_Type3Char::CPDF_Type3Char(CPDF_Form* pForm)
     : m_pForm(pForm), m_pBitmap(nullptr), m_bColored(FALSE) {}
 
 CPDF_Type3Char::~CPDF_Type3Char() {
   delete m_pForm;
   delete m_pBitmap;
 }