Re-land "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/include/pdfwindow/PWL_Note.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_PDFWINDOW_PWL_NOTE_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
 
 #include "fpdfsdk/include/pdfwindow/PWL_Button.h"
@@ skipping 86 matching lines @@
 
 class CPWL_Note_CloseBox : public CPWL_Button {
  public:
   CPWL_Note_CloseBox();
   ~CPWL_Note_CloseBox() override;
 
  protected:
   // CPWL_Button
   void DrawThisAppearance(CFX_RenderDevice* pDevice,
                           CFX_Matrix* pUser2Device) override;
-  FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override;
-  FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override;
+  FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+  FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
 
  private:
   FX_BOOL m_bMouseDown;
 };
 
 class CPWL_Note_LBBox : public CPWL_Wnd {
  public:
   CPWL_Note_LBBox();
   ~CPWL_Note_LBBox() override;
 
@@ skipping 40 matching lines @@
   FX_BOOL m_bSizeChanged;
   FX_FLOAT m_fOldMin;
   FX_FLOAT m_fOldMax;
 };
 
 class CPWL_Note_Options : public CPWL_Wnd {
  public:
   CPWL_Note_Options();
   ~CPWL_Note_Options() override;
 
-  CPDF_Rect GetContentRect() const;
+  CFX_FloatRect GetContentRect() const;
   void SetText(const CFX_WideString& sText);
 
   // CPWL_Wnd
   void RePosChildWnd() override;
   void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
   void DrawThisAppearance(CFX_RenderDevice* pDevice,
                           CFX_Matrix* pUser2Device) override;
   void SetTextColor(const CPWL_Color& color) override;
 
  private:
   CPWL_Label* m_pText;
 };
 
 class CPWL_Note_Contents : public CPWL_ListCtrl {
  public:
   CPWL_Note_Contents();
   ~CPWL_Note_Contents() override;
 
   void SetEditFocus(FX_BOOL bLast);
   CPWL_Edit* GetEdit() const;
 
   void SetText(const CFX_WideString& sText);
   CFX_WideString GetText() const;
 
   CPWL_NoteItem* CreateSubItem();
   void DeleteSubItem(IPWL_NoteItem* pNoteItem);
   int32_t CountSubItems() const;
   IPWL_NoteItem* GetSubItems(int32_t index) const;
 
-  virtual IPWL_NoteItem* GetHitNoteItem(const CPDF_Point& point);
+  virtual IPWL_NoteItem* GetHitNoteItem(const CFX_FloatPoint& point);
   void EnableRead(FX_BOOL bEnabled);
   void EnableModify(FX_BOOL bEnabled);
 
   // CPWL_ListCtrl
   CFX_ByteString GetClassName() const override;
   void OnNotify(CPWL_Wnd* pWnd,
                 FX_DWORD msg,
                 intptr_t wParam = 0,
                 intptr_t lParam = 0) override;
-  FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override;
+  FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
   void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
 
  private:
   CPWL_Note_Edit* m_pEdit;
 };
 
 class CPWL_NoteItem : public CPWL_Wnd, public IPWL_NoteItem {
  public:
   CPWL_NoteItem();
   ~CPWL_NoteItem() override;
 
-  virtual IPWL_NoteItem* GetHitNoteItem(const CPDF_Point& point);
+  virtual IPWL_NoteItem* GetHitNoteItem(const CFX_FloatPoint& point);
   virtual IPWL_NoteItem* GetFocusedNoteItem() const;
 
   virtual FX_BOOL IsTopItem() const { return FALSE; }
 
   virtual void ResetSubjectName(int32_t nItemIndex);
   void EnableRead(FX_BOOL bEnabled);
   void EnableModify(FX_BOOL bEnabled);
 
   void OnContentsValidate();
   void OnCreateNoteItem();
@@ skipping 14 matching lines @@
   void* GetPrivateData() const override;
   CFX_WideString GetAuthorName() const override;
   CPWL_Color GetBkColor() const override;
   CFX_WideString GetContents() const override;
   FX_SYSTEMTIME GetDateTime() const override;
   CFX_WideString GetSubjectName() const override;
   CPWL_Edit* GetEdit() const override;
 
  protected:
   // CPWL_Wnd
-  FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override;
-  FX_BOOL OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override;
+  FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+  FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
   CFX_ByteString GetClassName() const override;
   void RePosChildWnd() override;
   void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
   void OnNotify(CPWL_Wnd* pWnd,
                 FX_DWORD msg,
                 intptr_t wParam = 0,
                 intptr_t lParam = 0) override;
   FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth) override;
   FX_FLOAT GetItemLeftMargin() override;
   FX_FLOAT GetItemRightMargin() override;
 
   CPWL_NoteItem* CreateNoteItem();
   CPWL_NoteItem* GetParentNoteItem() const;
 
   void SetNoteFocus(FX_BOOL bLast);
-  void PopupNoteItemMenu(const CPDF_Point& point);
+  void PopupNoteItemMenu(const CFX_FloatPoint& point);
 
   virtual const CPWL_Note* GetNote() const;
   virtual IPWL_NoteNotify* GetNoteNotify() const;
 
  protected:
   CPWL_Label* m_pSubject;
   CPWL_Label* m_pDateTime;
   CPWL_Note_Contents* m_pContents;
 
  private:
@@ skipping 25 matching lines @@
 
   // CPWL_NoteItem
   void SetSubjectName(const CFX_WideString& sName) override;
   void SetAuthorName(const CFX_WideString& sName) override;
   CFX_WideString GetAuthorName() const override;
   void SetBkColor(const CPWL_Color& color) override;
   void ResetSubjectName(int32_t nItemIndex) override {}
   FX_BOOL IsTopItem() const override { return TRUE; }
   const CPWL_Note* GetNote() const override;
   IPWL_NoteNotify* GetNoteNotify() const override;
-  FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override;
-  FX_BOOL OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override;
+  FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+  FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
   FX_BOOL OnMouseWheel(short zDelta,
-                       const CPDF_Point& point,
+                       const CFX_FloatPoint& point,
                        FX_DWORD nFlag) override;
   void RePosChildWnd() override;
   void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
   void OnNotify(CPWL_Wnd* pWnd,
                 FX_DWORD msg,
                 intptr_t wParam = 0,
                 intptr_t lParam = 0) override;
 
  protected:
   FX_BOOL ResetScrollBar();
   void RePosNoteChildren();
   FX_BOOL ScrollBarShouldVisible();
 
  private:
   CPWL_Label* m_pAuthor;
   CPWL_Note_Icon* m_pIcon;
   CPWL_Note_CloseBox* m_pCloseBox;
   CPWL_Note_LBBox* m_pLBBox;
   CPWL_Note_RBBox* m_pRBBox;
   CPWL_ScrollBar* m_pContentsBar;
   CPWL_Note_Options* m_pOptions;
   IPWL_NoteNotify* m_pNoteNotify;
   FX_BOOL m_bResizing;
   PWL_SCROLL_INFO m_OldScrollInfo;
   FX_BOOL m_bEnableNotify;
   CFX_WideString m_sReplyString;
 };
 
 #endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_