Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/include/fxedit/fxet_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_FXET_EDIT_H_
 #define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
 
 #include "core/include/fpdfdoc/fpdf_vt.h"
@@ skipping 23 matching lines @@
   EP_SCRIPTTYPE,
   EP_UNDERLINE,
   EP_CROSSOUT,
   EP_CHARSPACE,
   EP_HORZSCALE,
   EP_BOLD,
   EP_ITALIC
 };
 
 struct CFX_Edit_LineRect {
-  CFX_Edit_LineRect(const CPVT_WordRange& wrLine, const CFX_FloatRect& rcLine)
+  CFX_Edit_LineRect(const CPVT_WordRange& wrLine, const CPDF_Rect& rcLine)
       : m_wrLine(wrLine), m_rcLine(rcLine) {}
 
   FX_BOOL operator!=(const CFX_Edit_LineRect& linerect) const {
     return FXSYS_memcmp(this, &linerect, sizeof(CFX_Edit_LineRect)) != 0;
   }
 
   FX_BOOL IsSameHeight(const CFX_Edit_LineRect& linerect) const {
     return FX_EDIT_IsFloatZero(
         (m_rcLine.top - m_rcLine.bottom) -
         (linerect.m_rcLine.top - linerect.m_rcLine.bottom));
   }
 
   FX_BOOL IsSameTop(const CFX_Edit_LineRect& linerect) const {
     return FX_EDIT_IsFloatZero(m_rcLine.top - linerect.m_rcLine.top);
   }
 
   FX_BOOL IsSameLeft(const CFX_Edit_LineRect& linerect) const {
     return FX_EDIT_IsFloatZero(m_rcLine.left - linerect.m_rcLine.left);
   }
 
   FX_BOOL IsSameRight(const CFX_Edit_LineRect& linerect) const {
     return FX_EDIT_IsFloatZero(m_rcLine.right - linerect.m_rcLine.right);
   }
 
   CPVT_WordRange m_wrLine;
-  CFX_FloatRect m_rcLine;
+  CPDF_Rect m_rcLine;
 };
 
 class CFX_Edit_LineRectArray {
  public:
   CFX_Edit_LineRectArray() {}
 
   virtual ~CFX_Edit_LineRectArray() { Empty(); }
 
   void Empty() {
     for (int32_t i = 0, sz = m_LineRects.GetSize(); i < sz; i++)
       delete m_LineRects.GetAt(i);
 
     m_LineRects.RemoveAll();
   }
 
   void RemoveAll() { m_LineRects.RemoveAll(); }
 
   void operator=(CFX_Edit_LineRectArray& rects) {
     Empty();
     for (int32_t i = 0, sz = rects.GetSize(); i < sz; i++)
       m_LineRects.Add(rects.GetAt(i));
 
     rects.RemoveAll();
   }
 
-  void Add(const CPVT_WordRange& wrLine, const CFX_FloatRect& rcLine) {
+  void Add(const CPVT_WordRange& wrLine, const CPDF_Rect& rcLine) {
     m_LineRects.Add(new CFX_Edit_LineRect(wrLine, rcLine));
   }
 
   int32_t GetSize() const { return m_LineRects.GetSize(); }
 
   CFX_Edit_LineRect* GetAt(int32_t nIndex) const {
     if (nIndex < 0 || nIndex >= m_LineRects.GetSize())
       return NULL;
 
     return m_LineRects.GetAt(nIndex);
   }
 
   CFX_ArrayTemplate<CFX_Edit_LineRect*> m_LineRects;
 };
 
 class CFX_Edit_RectArray {
  public:
   CFX_Edit_RectArray() {}
 
   virtual ~CFX_Edit_RectArray() { Empty(); }
 
   void Empty() {
     for (int32_t i = 0, sz = m_Rects.GetSize(); i < sz; i++)
       delete m_Rects.GetAt(i);
 
     m_Rects.RemoveAll();
   }
 
-  void Add(const CFX_FloatRect& rect) {
+  void Add(const CPDF_Rect& rect) {
     // check for overlapped area
     for (int32_t i = 0, sz = m_Rects.GetSize(); i < sz; i++) {
-      CFX_FloatRect* pRect = m_Rects.GetAt(i);
+      CPDF_Rect* pRect = m_Rects.GetAt(i);
       if (pRect && pRect->Contains(rect))
         return;
     }
 
-    m_Rects.Add(new CFX_FloatRect(rect));
+    m_Rects.Add(new CPDF_Rect(rect));
   }
 
   int32_t GetSize() const { return m_Rects.GetSize(); }
 
-  CFX_FloatRect* GetAt(int32_t nIndex) const {
+  CPDF_Rect* GetAt(int32_t nIndex) const {
     if (nIndex < 0 || nIndex >= m_Rects.GetSize())
       return NULL;
 
     return m_Rects.GetAt(nIndex);
   }
 
-  CFX_ArrayTemplate<CFX_FloatRect*> m_Rects;
+  CFX_ArrayTemplate<CPDF_Rect*> m_Rects;
 };
 
 class CFX_Edit_Refresh {
  public:
   CFX_Edit_Refresh();
   virtual ~CFX_Edit_Refresh();
 
   void BeginRefresh();
-  void Push(const CPVT_WordRange& linerange, const CFX_FloatRect& rect);
+  void Push(const CPVT_WordRange& linerange, const CPDF_Rect& rect);
   void NoAnalyse();
   void Analyse(int32_t nAlignment);
-  void AddRefresh(const CFX_FloatRect& rect);
+  void AddRefresh(const CPDF_Rect& rect);
   const CFX_Edit_RectArray* GetRefreshRects() const;
   void EndRefresh();
 
  private:
   CFX_Edit_LineRectArray m_NewLineRects;
   CFX_Edit_LineRectArray m_OldLineRects;
   CFX_Edit_RectArray m_RefreshRects;
 };
 
 /* ------------------------- CFX_Edit_Select ---------------------------- */
@@ skipping 358 matching lines @@
 
   // IFX_Edit
   void SetFontMap(IFX_Edit_FontMap* pFontMap) override;
   void SetVTProvider(IPDF_VariableText_Provider* pProvider) override;
   void SetNotify(IFX_Edit_Notify* pNotify) override;
   void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) override;
   IFX_Edit_Iterator* GetIterator() override;
   IPDF_VariableText* GetVariableText() override;
   IFX_Edit_FontMap* GetFontMap() override;
   void Initialize() override;
-  void SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint = TRUE) override;
-  void SetScrollPos(const CFX_FloatPoint& point) override;
+  void SetPlateRect(const CPDF_Rect& rect, FX_BOOL bPaint = TRUE) override;
+  void SetScrollPos(const CPDF_Point& point) override;
   void SetAlignmentH(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) override;
   void SetAlignmentV(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) override;
   void SetPasswordChar(FX_WORD wSubWord = '*', FX_BOOL bPaint = TRUE) override;
   void SetLimitChar(int32_t nLimitChar = 0, FX_BOOL bPaint = TRUE) override;
   void SetCharArray(int32_t nCharArray = 0, FX_BOOL bPaint = TRUE) override;
   void SetCharSpace(FX_FLOAT fCharSpace = 0.0f, FX_BOOL bPaint = TRUE) override;
   void SetHorzScale(int32_t nHorzScale = 100, FX_BOOL bPaint = TRUE) override;
   void SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint = TRUE) override;
   void SetMultiLine(FX_BOOL bMultiLine = TRUE, FX_BOOL bPaint = TRUE) override;
   void SetAutoReturn(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) override;
@@ skipping 10 matching lines @@
   FX_BOOL SetRichTextScript(int32_t nScriptType) override;
   FX_BOOL SetRichTextBold(FX_BOOL bBold = TRUE) override;
   FX_BOOL SetRichTextItalic(FX_BOOL bItalic = TRUE) override;
   FX_BOOL SetRichTextUnderline(FX_BOOL bUnderline = TRUE) override;
   FX_BOOL SetRichTextCrossout(FX_BOOL bCrossout = TRUE) override;
   FX_BOOL SetRichTextCharSpace(FX_FLOAT fCharSpace) override;
   FX_BOOL SetRichTextHorzScale(int32_t nHorzScale = 100) override;
   FX_BOOL SetRichTextLineLeading(FX_FLOAT fLineLeading) override;
   FX_BOOL SetRichTextLineIndent(FX_FLOAT fLineIndent) override;
   FX_BOOL SetRichTextAlignment(int32_t nAlignment) override;
-  void OnMouseDown(const CFX_FloatPoint& point,
+  void OnMouseDown(const CPDF_Point& point,
                    FX_BOOL bShift,
                    FX_BOOL bCtrl) override;
-  void OnMouseMove(const CFX_FloatPoint& point,
+  void OnMouseMove(const CPDF_Point& point,
                    FX_BOOL bShift,
                    FX_BOOL bCtrl) override;
   void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void SetText(const FX_WCHAR* text,
                int32_t charset = DEFAULT_CHARSET,
@@ skipping 13 matching lines @@
                      const CPVT_WordProps* pWordProps = NULL) override;
   FX_BOOL Redo() override;
   FX_BOOL Undo() override;
   int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace WordIndexToWordPlace(int32_t index) const override;
   CPVT_WordPlace GetLineBeginPlace(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace GetLineEndPlace(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace GetSectionBeginPlace(
       const CPVT_WordPlace& place) const override;
   CPVT_WordPlace GetSectionEndPlace(const CPVT_WordPlace& place) const override;
-  CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const override;
+  CPVT_WordPlace SearchWordPlace(const CPDF_Point& point) const override;
   int32_t GetCaret() const override;
   CPVT_WordPlace GetCaretWordPlace() const override;
   CFX_WideString GetSelText() const override;
   CFX_WideString GetText() const override;
   FX_FLOAT GetFontSize() const override;
   FX_WORD GetPasswordChar() const override;
-  CFX_FloatPoint GetScrollPos() const override;
+  CPDF_Point GetScrollPos() const override;
   int32_t GetCharArray() const override;
-  CFX_FloatRect GetPlateRect() const override;
-  CFX_FloatRect GetContentRect() const override;
+  CPDF_Rect GetPlateRect() const override;
+  CPDF_Rect GetContentRect() const override;
   CFX_WideString GetRangeText(const CPVT_WordRange& range) const override;
   int32_t GetHorzScale() const override;
   FX_FLOAT GetCharSpace() const override;
   int32_t GetTotalWords() const override;
   void SetSel(int32_t nStartChar, int32_t nEndChar) override;
   void GetSel(int32_t& nStartChar, int32_t& nEndChar) const override;
   void SelectAll() override;
   void SelectNone() override;
   FX_BOOL IsSelected() const override;
   void Paint() override;
@@ skipping 71 matching lines @@
                       FX_BOOL bAddUndo);
   FX_BOOL SetWordProps(EDIT_PROPS_E eProps,
                        const CPVT_WordPlace& place,
                        const CPVT_WordProps* pWordProps,
                        const CPVT_WordRange& wr,
                        FX_BOOL bAddUndo);
   void PaintSetProps(EDIT_PROPS_E eProps, const CPVT_WordRange& wr);
   void PaintInsertText(const CPVT_WordPlace& wpOld,
                        const CPVT_WordPlace& wpNew);
 
-  inline CFX_FloatPoint VTToEdit(const CFX_FloatPoint& point) const;
-  inline CFX_FloatPoint EditToVT(const CFX_FloatPoint& point) const;
-  inline CFX_FloatRect VTToEdit(const CFX_FloatRect& rect) const;
-  inline CFX_FloatRect EditToVT(const CFX_FloatRect& rect) const;
+  inline CPDF_Point VTToEdit(const CPDF_Point& point) const;
+  inline CPDF_Point EditToVT(const CPDF_Point& point) const;
+  inline CPDF_Rect VTToEdit(const CPDF_Rect& rect) const;
+  inline CPDF_Rect EditToVT(const CPDF_Rect& rect) const;
 
   void Refresh(REFRESH_PLAN_E ePlan,
                const CPVT_WordRange* pRange1 = NULL,
                const CPVT_WordRange* pRange2 = NULL);
   void RefreshPushLineRects(const CPVT_WordRange& wr);
   void RefreshPushRandomRects(const CPVT_WordRange& wr);
 
   void SetCaret(const CPVT_WordPlace& place);
   void SetCaretInfo();
   void SetCaretOrigin();
   void SetCaretChange();
 
   CPVT_WordRange GetLatinWordsRange(const CPVT_WordPlace& place) const;
   CPVT_WordRange CombineWordRange(const CPVT_WordRange& wr1,
                                   const CPVT_WordRange& wr2);
 
 
   void BeginGroupUndo(const CFX_WideString& sTitle);
   void EndGroupUndo();
   void AddEditUndoItem(CFX_Edit_UndoItem* pEditUndoItem);
 
   void SetPageInfo(const CPVT_WordPlace& place);
   CPVT_WordPlace SearchPageEndPlace(const CPVT_WordPlace& wpPageBegin,
-                                    const CFX_FloatPoint& point) const;
+                                    const CPDF_Point& point) const;
   FX_FLOAT GetLineTop(const CPVT_WordPlace& place) const;
   FX_FLOAT GetLineBottom(const CPVT_WordPlace& place) const;
 
  private:
   IPDF_VariableText* m_pVT;
   IFX_Edit_Notify* m_pNotify;
   IFX_Edit_OprNotify* m_pOprNotify;
   CFX_Edit_Provider* m_pVTProvide;
 
   CPVT_WordPlace m_wpCaret;
   CPVT_WordPlace m_wpOldCaret;
   CFX_Edit_Select m_SelState;
 
-  CFX_FloatPoint m_ptScrollPos;
-  CFX_FloatPoint m_ptRefreshScrollPos;
+  CPDF_Point m_ptScrollPos;
+  CPDF_Point m_ptRefreshScrollPos;
   FX_BOOL m_bEnableScroll;
   IFX_Edit_Iterator* m_pIterator;
   CFX_Edit_Refresh m_Refresh;
-  CFX_FloatPoint m_ptCaret;
+  CPDF_Point m_ptCaret;
   CFX_Edit_Undo m_Undo;
   int32_t m_nAlignment;
   FX_BOOL m_bNotifyFlag;
   FX_BOOL m_bEnableOverflow;
   FX_BOOL m_bEnableRefresh;
-  CFX_FloatRect m_rcOldContent;
+  CPDF_Rect m_rcOldContent;
   FX_BOOL m_bEnableUndo;
   FX_BOOL m_bNotify;
   FX_BOOL m_bOprNotify;
   CFX_Edit_GroupUndoItem* m_pGroupUndoItem;
 };
 
 /* ------------------------- CFX_Edit_Iterator ---------------------------- */
 
 class CFX_Edit_Iterator : public IFX_Edit_Iterator {
  public:
@@ skipping 37 matching lines @@
                            int32_t charset,
                            int32_t nFontIndex) override;
   int32_t GetDefaultFontIndex() override;
   FX_BOOL IsLatinWord(FX_WORD word) override;
 
  private:
   IFX_Edit_FontMap* m_pFontMap;
 };
 
 #endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_