Replace CPDF_Rect and CPDF_Point with CFX types.

Too many rectangle types.  Remove CPDF_Rect #define, and
make an equivalent point type in CFX, but stop short of
consolidating the N different forms of rectangles in CFX.

Also banish PDF_ClipFloat to the one .cpp file that needs it,
since it was in the vicinity of the .h file changes.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1740923003 .

1 files changed, 12 insertions, 12 deletions

diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h
index a1a5022b25..2459195acb 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Caret.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h
@@ -14,8 +14,8 @@ struct PWL_CARET_INFO {
   PWL_CARET_INFO() : bVisible(FALSE), ptHead(0, 0), ptFoot(0, 0) {}
 
   FX_BOOL bVisible;
-  CPDF_Point ptHead;
-  CPDF_Point ptFoot;
+  CFX_FloatPoint ptHead;
+  CFX_FloatPoint ptFoot;
 };
 
 class CPWL_Caret : public CPWL_Wnd {
@@ -28,26 +28,26 @@ class CPWL_Caret : public CPWL_Wnd {
   void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override;
   void DrawThisAppearance(CFX_RenderDevice* pDevice,
                           CFX_Matrix* pUser2Device) override;
-  void InvalidateRect(CPDF_Rect* pRect = NULL) override;
+  void InvalidateRect(CFX_FloatRect* pRect = NULL) override;
   void SetVisible(FX_BOOL bVisible) override {}
   void TimerProc() override;
 
   void SetCaret(FX_BOOL bVisible,
-                const CPDF_Point& ptHead,
-                const CPDF_Point& ptFoot);
-  CFX_ByteString GetCaretAppearanceStream(const CPDF_Point& ptOffset);
-  void SetInvalidRect(CPDF_Rect rc) { m_rcInvalid = rc; }
+                const CFX_FloatPoint& ptHead,
+                const CFX_FloatPoint& ptFoot);
+  CFX_ByteString GetCaretAppearanceStream(const CFX_FloatPoint& ptOffset);
+  void SetInvalidRect(CFX_FloatRect rc) { m_rcInvalid = rc; }
 
  private:
-  void GetCaretApp(CFX_ByteTextBuf& sAppStream, const CPDF_Point& ptOffset);
-  CPDF_Rect GetCaretRect() const;
+  void GetCaretApp(CFX_ByteTextBuf& sAppStream, const CFX_FloatPoint& ptOffset);
+  CFX_FloatRect GetCaretRect() const;
 
   FX_BOOL m_bFlash;
-  CPDF_Point m_ptHead;
-  CPDF_Point m_ptFoot;
+  CFX_FloatPoint m_ptHead;
+  CFX_FloatPoint m_ptFoot;
   FX_FLOAT m_fWidth;
   int32_t m_nDelay;
-  CPDF_Rect m_rcInvalid;
+  CFX_FloatRect m_rcInvalid;
 };
 
 #endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_