Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

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/include/fpdfapi/fpdf_parser.h"
 #include "core/include/fxcrt/fx_basic.h"
 #include "core/include/fxge/fx_dib.h"
 
 class CFX_RenderDevice;
 class CPDF_Font;
 class CFX_Matrix;
 class CPDF_PageObjectHolder;
-class CFX_FloatPoint;
+class CPDF_Point;
 class CPDF_TextObject;
 class IFX_Edit;
 class IFX_Edit_FontMap;
 class IFX_Edit_Iterator;
 class IFX_Edit_Notify;
 class IFX_Edit_UndoItem;
 class IFX_List;
 class IFX_List_Notify;
 class IFX_SystemHandler;
 class IPDF_VariableText;
@@ skipping 56 matching lines @@
                                  FX_FLOAT fContentMin,
                                  FX_FLOAT fContentMax,
                                  FX_FLOAT fSmallStep,
                                  FX_FLOAT fBigStep) = 0;
   // set the position of horizontal scrollbar.
   virtual void IOnSetScrollPosX(FX_FLOAT fx) = 0;
   // set the position of vertical scrollbar.
   virtual void IOnSetScrollPosY(FX_FLOAT fy) = 0;
   // set the caret information.
   virtual void IOnSetCaret(FX_BOOL bVisible,
-                           const CFX_FloatPoint& ptHead,
-                           const CFX_FloatPoint& ptFoot,
+                           const CPDF_Point& ptHead,
+                           const CPDF_Point& ptFoot,
                            const CPVT_WordPlace& place) = 0;
   // if the caret position is changed ,send the information of current postion
   // to user.
   virtual void IOnCaretChange(const CPVT_SecProps& secProps,
                               const CPVT_WordProps& wordProps) = 0;
   // if the text area is changed, send the information to user.
-  virtual void IOnContentChange(const CFX_FloatRect& rcContent) = 0;
+  virtual void IOnContentChange(const CPDF_Rect& rcContent) = 0;
   // Invalidate the rectangle relative to the bounding box of edit.
-  virtual void IOnInvalidateRect(CFX_FloatRect* pRect) = 0;
+  virtual void IOnInvalidateRect(CPDF_Rect* pRect) = 0;
 };
 
 class IFX_Edit_OprNotify {
  public:
   virtual ~IFX_Edit_OprNotify() {}
 
   // OprType: 0
   virtual void OnInsertWord(const CPVT_WordPlace& place,
                             const CPVT_WordPlace& oldplace) = 0;
   // OprType: 1
@@ skipping 81 matching lines @@
   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;
 
   // 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;
+  virtual void SetPlateRect(const CPDF_Rect& rect, FX_BOOL bPaint = TRUE) = 0;
   // set the scroll origin
-  virtual void SetScrollPos(const CFX_FloatPoint& point) = 0;
+  virtual void SetScrollPos(const CPDF_Point& point) = 0;
 
   // set the horizontal text alignment in text box, nFormat (0:left 1:middle
   // 2:right).
   virtual void SetAlignmentH(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) = 0;
   // set the vertical text alignment in text box, nFormat (0:top 1:center
   // 2:bottom).
   virtual void SetAlignmentV(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) = 0;
   // if the text is shown in secret , set a character for substitute.
   virtual void SetPasswordChar(FX_WORD wSubWord = '*',
                                FX_BOOL bPaint = TRUE) = 0;
@@ skipping 69 matching lines @@
   // get the caret position.
   virtual int32_t GetCaret() const = 0;
   virtual CPVT_WordPlace GetCaretWordPlace() const = 0;
   // get the string of selected text.
   virtual CFX_WideString GetSelText() const = 0;
   // get the text conent
   virtual CFX_WideString GetText() const = 0;
   // query if any text is selected.
   virtual FX_BOOL IsSelected() const = 0;
   // get the scroll origin
-  virtual CFX_FloatPoint GetScrollPos() const = 0;
+  virtual CPDF_Point GetScrollPos() const = 0;
   // get the bounding box of the text area.
-  virtual CFX_FloatRect GetPlateRect() const = 0;
+  virtual CPDF_Rect GetPlateRect() const = 0;
   // get the fact area of the text.
-  virtual CFX_FloatRect GetContentRect() const = 0;
+  virtual CPDF_Rect GetContentRect() const = 0;
   // get the visible word range
   virtual CPVT_WordRange GetVisibleWordRange() const = 0;
   // get the whole word range
   virtual CPVT_WordRange GetWholeWordRange() const = 0;
   // get the word range of select text
   virtual CPVT_WordRange GetSelectWordRange() const = 0;
 
   // send the mousedown message to edit for response.
   // if Shift key is hold, bShift is TRUE, is Ctrl key is hold, bCtrl is TRUE.
-  virtual void OnMouseDown(const CFX_FloatPoint& point,
+  virtual void OnMouseDown(const CPDF_Point& point,
                            FX_BOOL bShift,
                            FX_BOOL bCtrl) = 0;
   // send the mousemove message to edit when mouse down is TRUE.
-  virtual void OnMouseMove(const CFX_FloatPoint& point,
+  virtual void OnMouseMove(const CPDF_Point& point,
                            FX_BOOL bShift,
                            FX_BOOL bCtrl) = 0;
   // send the UP key message to edit.
   virtual void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   // send the DOWN key message to edit.
   virtual void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   // send the LEFT key message to edit.
   virtual void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   // send the RIGHT key message to edit.
   virtual void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
@@ skipping 64 matching lines @@
 
   // get the beginning position of a section
   virtual CPVT_WordPlace GetSectionBeginPlace(
       const CPVT_WordPlace& place) const = 0;
 
   // get the ending position of a section
   virtual CPVT_WordPlace GetSectionEndPlace(
       const CPVT_WordPlace& place) const = 0;
 
   // search a wordplace form point
-  virtual CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const = 0;
+  virtual CPVT_WordPlace SearchWordPlace(const CPDF_Point& point) const = 0;
 
   // get the font size of non_rich text or default font size of richtext.
   virtual FX_FLOAT GetFontSize() const = 0;
   // get the mask character.
   virtual FX_WORD GetPasswordChar() const = 0;
   // get the count of charArray
   virtual int32_t GetCharArray() const = 0;
   // get the horizontal scale of all characters
   virtual int32_t GetHorzScale() const = 0;
   // get the space of two characters
   virtual FX_FLOAT GetCharSpace() const = 0;
   // get the latin words of specified range
   virtual CFX_WideString GetRangeText(const CPVT_WordRange& range) const = 0;
   // is the text full in bounding box
   virtual FX_BOOL IsTextFull() const = 0;
   virtual FX_BOOL CanUndo() const = 0;
   virtual FX_BOOL CanRedo() const = 0;
   // if the content is changed after settext?
   virtual FX_BOOL IsModified() const = 0;
   // get the total words in edit
   virtual int32_t GetTotalWords() const = 0;
 
   virtual void AddUndoItem(IFX_Edit_UndoItem* pUndoItem) = 0;
 
   static CFX_ByteString GetEditAppearanceStream(
       IFX_Edit* pEdit,
-      const CFX_FloatPoint& ptOffset,
+      const CPDF_Point& ptOffset,
       const CPVT_WordRange* pRange = NULL,
       FX_BOOL bContinuous = TRUE,
       FX_WORD SubWord = 0);
   static CFX_ByteString GetSelectAppearanceStream(
       IFX_Edit* pEdit,
-      const CFX_FloatPoint& ptOffset,
+      const CPDF_Point& ptOffset,
       const CPVT_WordRange* pRange = NULL);
   static void DrawEdit(CFX_RenderDevice* pDevice,
                        CFX_Matrix* pUser2Device,
                        IFX_Edit* pEdit,
                        FX_COLORREF crTextFill,
                        FX_COLORREF crTextStroke,
-                       const CFX_FloatRect& rcClip,
-                       const CFX_FloatPoint& ptOffset,
+                       const CPDF_Rect& rcClip,
+                       const CPDF_Point& ptOffset,
                        const CPVT_WordRange* pRange,
                        IFX_SystemHandler* pSystemHandler,
                        void* pFFLData);
   static void DrawUnderline(CFX_RenderDevice* pDevice,
                             CFX_Matrix* pUser2Device,
                             IFX_Edit* pEdit,
                             FX_COLORREF color,
-                            const CFX_FloatRect& rcClip,
-                            const CFX_FloatPoint& ptOffset,
+                            const CPDF_Rect& rcClip,
+                            const CPDF_Point& ptOffset,
                             const CPVT_WordRange* pRange);
   static void DrawRichEdit(CFX_RenderDevice* pDevice,
                            CFX_Matrix* pUser2Device,
                            IFX_Edit* pEdit,
-                           const CFX_FloatRect& rcClip,
-                           const CFX_FloatPoint& ptOffset,
+                           const CPDF_Rect& rcClip,
+                           const CPDF_Point& ptOffset,
                            const CPVT_WordRange* pRange);
   static void GeneratePageObjects(
       CPDF_PageObjectHolder* pObjectHolder,
       IFX_Edit* pEdit,
-      const CFX_FloatPoint& ptOffset,
+      const CPDF_Point& ptOffset,
       const CPVT_WordRange* pRange,
       FX_COLORREF crText,
       CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray);
   static void GenerateRichPageObjects(
       CPDF_PageObjectHolder* pObjectHolder,
       IFX_Edit* pEdit,
-      const CFX_FloatPoint& ptOffset,
+      const CPDF_Point& ptOffset,
       const CPVT_WordRange* pRange,
       CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray);
   static void GenerateUnderlineObjects(CPDF_PageObjectHolder* pObjectHolder,
                                        IFX_Edit* pEdit,
-                                       const CFX_FloatPoint& ptOffset,
+                                       const CPDF_Point& ptOffset,
                                        const CPVT_WordRange* pRange,
                                        FX_COLORREF color);
 
  protected:
   virtual ~IFX_Edit() {}
 };
 
 class IFX_List_Notify {
  public:
   // 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;
   // set the vertical scrollbar information.
   virtual void IOnSetScrollInfoY(FX_FLOAT fPlateMin,
                                  FX_FLOAT fPlateMax,
                                  FX_FLOAT fContentMin,
                                  FX_FLOAT fContentMax,
                                  FX_FLOAT fSmallStep,
                                  FX_FLOAT fBigStep) = 0;
   // set the position of horizontal scrollbar.
   virtual void IOnSetScrollPosX(FX_FLOAT fx) = 0;
   // set the position of vertical scrollbar.
   virtual void IOnSetScrollPosY(FX_FLOAT fy) = 0;
   // Invalidate the rectangle relative to the bounding box of edit.
-  virtual void IOnInvalidateRect(CFX_FloatRect* pRect) = 0;
+  virtual void IOnInvalidateRect(CPDF_Rect* pRect) = 0;
 
  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 SetNotify(IFX_List_Notify* pNotify) = 0;
 
-  virtual void SetPlateRect(const CFX_FloatRect& rect) = 0;
+  virtual void SetPlateRect(const CPDF_Rect& rect) = 0;
   virtual void SetFontSize(FX_FLOAT fFontSize) = 0;
 
-  virtual CFX_FloatRect GetPlateRect() const = 0;
-  virtual CFX_FloatRect GetContentRect() const = 0;
+  virtual CPDF_Rect GetPlateRect() const = 0;
+  virtual CPDF_Rect GetContentRect() const = 0;
 
   virtual FX_FLOAT GetFontSize() const = 0;
   virtual IFX_Edit* GetItemEdit(int32_t nIndex) const = 0;
   virtual int32_t GetCount() const = 0;
   virtual FX_BOOL IsItemSelected(int32_t nIndex) const = 0;
   virtual FX_FLOAT GetFirstHeight() const = 0;
 
   virtual void SetMultipleSel(FX_BOOL bMultiple) = 0;
   virtual FX_BOOL IsMultipleSel() const = 0;
   virtual FX_BOOL IsValid(int32_t nItemIndex) const = 0;
   virtual int32_t FindNext(int32_t nIndex, FX_WCHAR nChar) const = 0;
 
-  virtual void SetScrollPos(const CFX_FloatPoint& point) = 0;
+  virtual void SetScrollPos(const CPDF_Point& point) = 0;
   virtual void ScrollToListItem(int32_t nItemIndex) = 0;
-  virtual CFX_FloatRect GetItemRect(int32_t nIndex) const = 0;
+  virtual CPDF_Rect GetItemRect(int32_t nIndex) const = 0;
   virtual int32_t GetCaret() const = 0;
   virtual int32_t GetSelect() const = 0;
   virtual int32_t GetTopItem() const = 0;
-  virtual int32_t GetItemIndex(const CFX_FloatPoint& point) const = 0;
+  virtual int32_t GetItemIndex(const CPDF_Point& point) const = 0;
   virtual int32_t GetFirstSelected() const = 0;
 
   virtual void AddString(const FX_WCHAR* string) = 0;
   virtual void SetTopItem(int32_t nIndex) = 0;
   virtual void Select(int32_t nItemIndex) = 0;
   virtual void SetCaret(int32_t nItemIndex) = 0;
   virtual void Empty() = 0;
   virtual void Cancel() = 0;
   virtual CFX_WideString GetText() const = 0;
 
-  virtual void OnMouseDown(const CFX_FloatPoint& point,
+  virtual void OnMouseDown(const CPDF_Point& point,
                            FX_BOOL bShift,
                            FX_BOOL bCtrl) = 0;
-  virtual void OnMouseMove(const CFX_FloatPoint& point,
+  virtual void OnMouseMove(const CPDF_Point& point,
                            FX_BOOL bShift,
                            FX_BOOL bCtrl) = 0;
   virtual void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   virtual void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   virtual void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
   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(FX_WORD nChar, FX_BOOL bShift, FX_BOOL bCtrl) = 0;
 
  protected:
   virtual ~IFX_List() {}
 };
 
 CFX_ByteString GetPDFWordString(IFX_Edit_FontMap* pFontMap,
                                 int32_t nFontIndex,
                                 FX_WORD Word,
                                 FX_WORD SubWord);
 
 #endif  // FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_