XFA: Manually apply changes to fpdf_text.h and fx_font.h from master

core/include/fpdftext/fpdf_text.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
 #define CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
 
 #include "../fpdfapi/fpdf_parser.h"
@@ skipping 54 matching lines @@
 #define FPDFTEXT_WRITINGMODE_LRTB 1
 #define FPDFTEXT_WRITINGMODE_RLTB 2
 #define FPDFTEXT_WRITINGMODE_TBRL 3
 class CPDFText_ParseOptions {
  public:
   CPDFText_ParseOptions();
   FX_BOOL m_bGetCharCodeOnly;
   FX_BOOL m_bNormalizeObjs;
   FX_BOOL m_bOutputHyphen;
 };
+
 class IPDF_TextPage {
  public:
-  virtual ~IPDF_TextPage() {}
+  static IPDF_TextPage* CreateTextPage(const CPDF_Page* pPage, int flags = 0);
   static IPDF_TextPage* CreateTextPage(const CPDF_Page* pPage,
                                        CPDFText_ParseOptions ParserOptions);
-  static IPDF_TextPage* CreateTextPage(const CPDF_Page* pPage, int flags = 0);
   static IPDF_TextPage* CreateTextPage(const CPDF_PageObjects* pObjs,
                                        int flags = 0);
   static IPDF_TextPage* CreateReflowTextPage(IPDF_ReflowedPage* pRefPage);
 
+  virtual ~IPDF_TextPage() {}
+
   virtual void NormalizeObjects(FX_BOOL bNormalize) = 0;
 
   virtual FX_BOOL ParseTextPage() = 0;
 
-  virtual FX_BOOL IsParsered() const = 0;
+  virtual bool IsParsed() const = 0;
 
- public:
   virtual int CharIndexFromTextIndex(int TextIndex) const = 0;
 
   virtual int TextIndexFromCharIndex(int CharIndex) const = 0;
 
   virtual int CountChars() const = 0;
 
   virtual void GetCharInfo(int index, FPDF_CHAR_INFO& info) const = 0;
 
   virtual void GetRectArray(int start,
                             int nCount,
@@ skipping 30 matching lines @@
                                    FX_FLOAT right,
                                    FX_FLOAT bottom,
                                    FX_BOOL bContains = FALSE) = 0;
 
   virtual void GetBoundedSegment(int index, int& start, int& count) const = 0;
 
   virtual int GetWordBreak(int index, int direction) const = 0;
 
   virtual CFX_WideString GetPageText(int start = 0, int nCount = -1) const = 0;
 };
+
 #define FPDFTEXT_MATCHCASE 0x00000001
 #define FPDFTEXT_MATCHWHOLEWORD 0x00000002
 #define FPDFTEXT_CONSECUTIVE 0x00000004
 class IPDF_TextPageFind {
  public:
   virtual ~IPDF_TextPageFind() {}
 
   static IPDF_TextPageFind* CreatePageFind(const IPDF_TextPage* pTextPage);
 
  public:
@@ skipping 23 matching lines @@
   virtual int CountLinks() const = 0;
 
   virtual CFX_WideString GetURL(int index) const = 0;
 
   virtual void GetBoundedSegment(int index, int& start, int& count) const = 0;
 
   virtual void GetRects(int index, CFX_RectArray& rects) const = 0;
 };
 
 #endif  // CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_