Merge to XFA: Tidy up CPDFDOC_Environment.

fpdfsdk/include/formfiller/FFL_FormFiller.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_FORMFILLER_FFL_FORMFILLER_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
 
 #include "FFL_IFormFiller.h"
 #include "FFL_CBA_Fontmap.h"
 
 class CPDFSDK_Annot;
 class CFFL_FormFiller;
 class CFFL_Notify;
 class CPDFDoc_Environment;
 class CPDFSDK_PageView;
 class CPDFSDK_Document;
 class CPDFSDK_Widget;
 
-
 struct FFL_KeyStrokeData
 {
         CFX_WideString          swValue;
         FX_BOOL                         bFull;
         int                                     nSelStart;
         int                                     nSelEnd;
 };
 
-
-
-class CFFL_FormFiller : /*public IBA_AnnotFiller,*/ public IPWL_Provider, public CPWL_TimerHandler
+class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler
 {
 public:
         CFFL_FormFiller(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot);
         virtual ~CFFL_FormFiller();
 
         virtual FX_RECT                         GetViewBBox(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
-        virtual void                            OnDraw(CPDFSDK_PageView *pPageView, /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
+        virtual void                            OnDraw(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot,
                                                                         CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
-                                                                        /*const CRect& rcWindow, */FX_DWORD dwFlags);
-        virtual void                            OnDrawDeactive(CPDFSDK_PageView *pPageView, /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
-                                                                CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
-                                                                /*const CRect& rcWindow, */FX_DWORD dwFlags);
+                                                                        FX_DWORD dwFlags);
+        virtual void                            OnDrawDeactive(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot,
+                                                                        CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
+                                                                        FX_DWORD dwFlags);
 
         virtual void                            OnCreate(CPDFSDK_Annot* pAnnot);
         virtual void                            OnLoad(CPDFSDK_Annot* pAnnot);
         virtual void                            OnDelete(CPDFSDK_Annot* pAnnot);
 
         virtual void                            OnMouseEnter(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
         virtual void                            OnMouseExit(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
 
         virtual FX_BOOL                         OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
         virtual FX_BOOL                         OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
@@ skipping 48 matching lines @@
         CPDF_Rect                                       PWLtoFFL(const CPDF_Rect& rect);
         CPDF_Point                                      FFLtoPWL(const CPDF_Point& point);
         CPDF_Point                                      PWLtoFFL(const CPDF_Point& point);
 
         CPDF_Point                                      WndtoPWL(CPDFSDK_PageView* pPageView, const CPDF_Point& pt);
         CPDF_Rect                                       FFLtoWnd(CPDFSDK_PageView* pPageView, const CPDF_Rect& rect);
 
         void                                            SetWindowRect(CPDFSDK_PageView* pPageView, const CPDF_Rect& rcWindow);
         CPDF_Rect                                       GetWindowRect(CPDFSDK_PageView* pPageView);
 
-        static void                                     FFL_FreeData(void* pData);
-
         FX_BOOL                                         CommitData(CPDFSDK_PageView* pPageView, FX_UINT nFlag);
         virtual FX_BOOL                         IsDataChanged(CPDFSDK_PageView* pPageView);
         virtual void                            SaveData(CPDFSDK_PageView* pPageView);
 
         virtual void                            GetKeyStrokeData(CPDFSDK_PageView* pPageView, FFL_KeyStrokeData& data);
         virtual FX_BOOL                         IsFieldFull(CPDFSDK_PageView* pPageView);
 
         CPWL_Wnd*                                       GetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bNew);
         void                                            DestroyPDFWindow(CPDFSDK_PageView* pPageView);
         void                                            EscapeFiller(CPDFSDK_PageView* pPageView, FX_BOOL bDestroyPDFWindow);
@@ skipping 28 matching lines @@
 {
 public:
         CFFL_Button(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget);
         virtual ~CFFL_Button();
 
         virtual void                            OnMouseEnter(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
         virtual void                            OnMouseExit(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
         virtual FX_BOOL                         OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
         virtual FX_BOOL                         OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
         virtual FX_BOOL                         OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-        virtual void                            OnDraw(CPDFSDK_PageView *pPageView/*, HDC hDC*/, CPDFSDK_Annot* pAnnot,
-                                                                CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
-                                                                /*const CRect& rcWindow,*/ FX_DWORD dwFlags);
+        virtual void                            OnDraw(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot,
+                                                                        CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
+                                                                        FX_DWORD dwFlags);
 
-        virtual void                            OnDrawDeactive(CPDFSDK_PageView *pPageView, /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
-                                                                CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
-                                                                /*const CRect& rcWindow, */FX_DWORD dwFlags);
+        virtual void                            OnDrawDeactive(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot,
+                                                                        CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
+                                                                        FX_DWORD dwFlags);
 protected:
         FX_BOOL                                         m_bMouseIn;
         FX_BOOL                                         m_bMouseDown;
 };
 
 #endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_