Remove core/include/fpdfdoc/fpdf_vt.h

fpdfsdk/include/fxedit/fx_edit.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 FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
 #define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
 
+#include "core/fpdfdoc/include/cpdf_variabletext.h"
 #include "core/fxcrt/include/fx_basic.h"
-#include "core/include/fpdfdoc/fpdf_vt.h"
 #include "core/include/fxge/fx_dib.h"
 
+class CPDF_Font;
+class CPDF_PageObjectHolder;
+class CPDF_TextObject;
+class CFX_FloatPoint;
+class CFX_Matrix;
 class CFX_RenderDevice;
-class CPDF_Font;
-class CFX_Matrix;
-class CPDF_PageObjectHolder;
-class CFX_FloatPoint;
-class CPDF_TextObject;
 class IFX_Edit;
-class IFX_Edit_FontMap;
+class IPVT_FontMap;
 class IFX_Edit_Iterator;
 class IFX_Edit_Notify;
 class IFX_Edit_UndoItem;
 class IFX_List;
 class IFX_List_Notify;
 class IFX_SystemHandler;
 
 struct CPVT_Line;
 struct CPVT_SecProps;
 struct CPVT_Section;
@@ skipping 12 matching lines @@
 #define PVTWORD_STYLE_ITALIC 0x0040L
 
 #define FX_EDIT_ISLATINWORD(u)                  \
   (u == 0x2D || (u <= 0x005A && u >= 0x0041) || \
    (u <= 0x007A && u >= 0x0061) || (u <= 0x02AF && u >= 0x00C0))
 
 #ifndef DEFAULT_CHARSET
 #define DEFAULT_CHARSET 1
 #endif
 
-class IFX_Edit_FontMap {
- public:
-  virtual ~IFX_Edit_FontMap() {}
-  // map a fontindex to pdf font.
-  virtual CPDF_Font* GetPDFFont(int32_t nFontIndex) = 0;
-  // get the alias of a pdf font.
-  virtual CFX_ByteString GetPDFFontAlias(int32_t nFontIndex) = 0;
-  // get the index of a font that can show a word.
-  virtual int32_t GetWordFontIndex(uint16_t word,
-                                   int32_t charset,
-                                   int32_t nFontIndex) = 0;
-  // get the charcode of word from unicode
-  virtual int32_t CharCodeFromUnicode(int32_t nFontIndex, uint16_t word) = 0;
-  // get the charset of unicode
-  virtual int32_t CharSetFromUnicode(uint16_t word, int32_t nOldCharset) = 0;
-};
-
 class IFX_Edit_Notify {
  public:
   virtual ~IFX_Edit_Notify() {}
   // set the horizontal scrollbar information.
   virtual void IOnSetScrollInfoX(FX_FLOAT fPlateMin,
                                  FX_FLOAT fPlateMax,
                                  FX_FLOAT fContentMin,
                                  FX_FLOAT fContentMax,
                                  FX_FLOAT fSmallStep,
                                  FX_FLOAT fBigStep) = 0;
@@ skipping 95 matching lines @@
   virtual void Undo() = 0;
   virtual void Redo() = 0;
   virtual CFX_WideString GetUndoTitle() = 0;
 };
 
 class IFX_Edit {
  public:
   static IFX_Edit* NewEdit();
   static void DelEdit(IFX_Edit* pEdit);
 
-  // set a IFX_Edit_FontMap pointer implemented by user.
-  virtual void SetFontMap(IFX_Edit_FontMap* pFontMap) = 0;
+  // set a IPVT_FontMap pointer implemented by user.

[Tom Sepez, 2016/04/05 16:58:23]

nit: blank line before each new // comment here, as long as we're mucking with
it.

[dsinclair, 2016/04/05 17:29:20]

Done.

+  virtual void SetFontMap(IPVT_FontMap* pFontMap) = 0;
   // if user don't like to use FontMap, implement VTProvider and set it
   // directly.
-  virtual void SetVTProvider(IPDF_VariableText::Provider* pProvider) = 0;
+  virtual void SetVTProvider(CPDF_VariableText::Provider* pProvider) = 0;
   // set a IFX_Edit_Notify pointer implemented by user.
   virtual void SetNotify(IFX_Edit_Notify* pNotify) = 0;
   virtual void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) = 0;
   // get a pointer allocated by CPDF_Edit, by this pointer, user can iterate the
   // contents of edit, but don't need to release.
   virtual IFX_Edit_Iterator* GetIterator() = 0;
   // get a VT pointer relative to this edit.
-  virtual IPDF_VariableText* GetVariableText() = 0;
-  // get the IFX_Edit_FontMap pointer set by user.
-  virtual IFX_Edit_FontMap* GetFontMap() = 0;
+  virtual CPDF_VariableText* GetVariableText() = 0;
+  // get the IPVT_FontMap pointer set by user.
+  virtual IPVT_FontMap* GetFontMap() = 0;
 
   // initialize the edit.
   virtual void Initialize() = 0;
 
   // set the bounding box of the text area.
   virtual void SetPlateRect(const CFX_FloatRect& rect,
                             FX_BOOL bPaint = TRUE) = 0;
   // set the scroll origin
   virtual void SetScrollPos(const CFX_FloatPoint& point) = 0;
 
@@ skipping 39 matching lines @@
   virtual void SetRichText(FX_BOOL bRichText = TRUE, FX_BOOL bPaint = TRUE) = 0;
   // set the fontsize of selected text.
   virtual FX_BOOL SetRichFontSize(FX_FLOAT fFontSize) = 0;
   // set the fontindex of selected text, user can change the font of selected
   // text.
   virtual FX_BOOL SetRichFontIndex(int32_t nFontIndex) = 0;
   // set the textcolor of selected text.
   virtual FX_BOOL SetRichTextColor(FX_COLORREF dwColor) = 0;
   // set the text script type of selected text. (0:normal 1:superscript
   // 2:subscript)
-  virtual FX_BOOL SetRichTextScript(int32_t nScriptType) = 0;
+  virtual FX_BOOL SetRichTextScript(
+      CPDF_VariableText::ScriptType nScriptType) = 0;
   // set the bold font style of selected text.
   virtual FX_BOOL SetRichTextBold(FX_BOOL bBold = TRUE) = 0;
   // set the italic font style of selected text.
   virtual FX_BOOL SetRichTextItalic(FX_BOOL bItalic = TRUE) = 0;
   // set the underline style of selected text.
   virtual FX_BOOL SetRichTextUnderline(FX_BOOL bUnderline = TRUE) = 0;
   // set the crossout style of selected text.
   virtual FX_BOOL SetRichTextCrossout(FX_BOOL bCrossout = TRUE) = 0;
   // set the charspace of selected text, in user coordinate.
   virtual FX_BOOL SetRichTextCharSpace(FX_FLOAT fCharSpace) = 0;
@@ skipping 234 matching lines @@
 
  protected:
   virtual ~IFX_List_Notify() {}
 };
 
 class IFX_List {
  public:
   static IFX_List* NewList();
   static void DelList(IFX_List* pList);
 
-  virtual void SetFontMap(IFX_Edit_FontMap* pFontMap) = 0;
+  virtual void SetFontMap(IPVT_FontMap* pFontMap) = 0;
   virtual void SetNotify(IFX_List_Notify* pNotify) = 0;
 
   virtual void SetPlateRect(const CFX_FloatRect& rect) = 0;
   virtual void SetFontSize(FX_FLOAT fFontSize) = 0;
 
   virtual CFX_FloatRect GetPlateRect() const = 0;
   virtual CFX_FloatRect GetContentRect() const = 0;
 
   virtual FX_FLOAT GetFontSize() const = 0;
   virtual IFX_Edit* GetItemEdit(int32_t nIndex) const = 0;
@@ skipping 35 matching lines @@
   virtual void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   virtual void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   virtual void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   virtual void OnVK(int32_t nItemIndex, FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   virtual FX_BOOL OnChar(uint16_t nChar, FX_BOOL bShift, FX_BOOL bCtrl) = 0;
 
  protected:
   virtual ~IFX_List() {}
 };
 
-CFX_ByteString GetPDFWordString(IFX_Edit_FontMap* pFontMap,
+CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap,
                                 int32_t nFontIndex,
                                 uint16_t Word,
                                 uint16_t SubWord);
 
 #endif  // FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_