Merge to XFA: Cleanup: Remove CFFL_IFormFiller::GetCommitKey() that always returns 0.

Remove callers and related code that all just pass zeros around.

Also remove CFFL_IFormFiller::GetKeyDown().

R=tsepez@chromium.org

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

(cherry picked from commit 35c3163d55bebea8095474181f807ddfb2f4f806)

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

5 files changed, 19 insertions, 47 deletions

diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index 7b5f119f50..80bddb74f4 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -1,7 +1,7 @@
 // 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_IFORMFILLER_H_
@@ -14,21 +14,7 @@ class CFFL_PrivateData;
 
 #define CFFL_Widget2Filler		CFX_MapPtrTemplate<CPDFSDK_Annot*, CFFL_FormFiller*>
 
-// #define IsALTpressed()			(GetKeyState(VK_MENU) < 0)
-// #define IsCTRLpressed()			(GetKeyState(VK_CONTROL) < 0)
-// #define IsSHIFTpressed()		(GetKeyState(VK_SHIFT)&0x8000)
-// #define IsINSERTpressed()		(GetKeyState(VK_INSERT) & 0x01)	
-// #define VK_SHIFT          0x10
-// #define VK_CONTROL        0x11
-// #define VK_MENU           0x12
-// #define VK_RETURN         0x0D
-// #define VK_SPACE          0x20
-// #define VK_ESCAPE         0x1B
-
-
-
-class CFFL_IFormFiller :/* public IBA_AnnotFiller, */public IPWL_Filler_Notify//, 
-//	public IUndo_EventHandler, public IClipboard_Handler
+class CFFL_IFormFiller : public IPWL_Filler_Notify
 {
 public:
 	CFFL_IFormFiller(CPDFDoc_Environment* pApp);
@@ -36,7 +22,7 @@ public:
 
 	virtual FX_BOOL				Annot_HitTest(CPDFSDK_PageView* pPageView,CPDFSDK_Annot* pAnnot, CPDF_Point point);
 	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, /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
 									CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
 									/*const CRect& rcWindow,*/ FX_DWORD dwFlags);
 
@@ -69,13 +55,13 @@ public:
 public:
 	virtual void				QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax, int32_t & nRet, FX_FLOAT & fPopupRet);
 	virtual void				OnBeforeKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode,
-										CFX_WideString & strChange, const CFX_WideString& strChangeEx, 
+										CFX_WideString & strChange, const CFX_WideString& strChangeEx,
 										int nSelStart, int nSelEnd,
 										FX_BOOL bKeyDown, FX_BOOL & bRC, FX_BOOL & bExit, FX_DWORD nFlag);
 	virtual void				OnAfterKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, FX_BOOL & bExit, FX_DWORD nFlag) ;
 
 	virtual void				OnSetWindowRect(void* pPrivateData, const CPDF_Rect & rcWindow);
-	virtual void				OnKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode, CFX_WideString & strChange, 
+	virtual void				OnKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode, CFX_WideString & strChange,
 									const CFX_WideString& strChangeEx, FX_BOOL bKeyDown, FX_BOOL & bRC, FX_BOOL & bExit);
 	virtual void				OnPopupPreOpen(void* pPrivateData, FX_BOOL& bExit, FX_DWORD nFlag);
 	virtual void				OnPopupPostOpen(void* pPrivateData, FX_BOOL& bExit, FX_DWORD nFlag);
@@ -87,13 +73,13 @@ public:
 	virtual void				AfterRedo(CPDFSDK_Document* pDocument);
 
 public:
-	virtual FX_BOOL				CanCopy(CPDFSDK_Document* pDocument); 
-	virtual FX_BOOL				CanCut(CPDFSDK_Document* pDocument); 
-	virtual FX_BOOL				CanPaste(CPDFSDK_Document* pDocument); 
+	virtual FX_BOOL				CanCopy(CPDFSDK_Document* pDocument);
+	virtual FX_BOOL				CanCut(CPDFSDK_Document* pDocument);
+	virtual FX_BOOL				CanPaste(CPDFSDK_Document* pDocument);
 
-	virtual void				DoCopy(CPDFSDK_Document* pDocument); 
-	virtual void				DoCut(CPDFSDK_Document* pDocument); 
-	virtual void				DoPaste(CPDFSDK_Document* pDocument); 
+	virtual void				DoCopy(CPDFSDK_Document* pDocument);
+	virtual void				DoCut(CPDFSDK_Document* pDocument);
+	virtual void				DoPaste(CPDFSDK_Document* pDocument);
 
 public:
 	CFFL_FormFiller*			GetFormFiller(CPDFSDK_Annot* pAnnot, FX_BOOL bRegister);
@@ -110,29 +96,15 @@ public:
 	void						OnCalculate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bExit, FX_DWORD nFlag);
 	void						OnFormat(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bExit, FX_DWORD nFlag);
 	void						OnButtonUp(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit,FX_UINT nFlag);
-// 	static LRESULT CALLBACK		FFL_WndProc(
-// 									  int code,       // hook code
-// 									  WPARAM wParam,  // virtual-key code
-// 									  LPARAM lParam   // keystroke-message information
-// 										);
-// 	static MSG					GetLastMessage();
-	static int					GetCommitKey();
-	static FX_BOOL				GetKeyDown();
-
 	void						OnClick(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit, FX_UINT nFlag);
 	void						OnFull(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit, FX_UINT nFlag);
 	void						OnPreOpen(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit, FX_UINT nFlag);
 	void						OnPostOpen(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit, FX_UINT nFlag);
 
-public:
-// 	static MSG					g_Msg;
-// 	static HHOOK				m_hookSheet;
-
 private:
 	void						UnRegisterFormFiller(CPDFSDK_Annot* pAnnot);
 	void						SetFocusAnnotTab(CPDFSDK_Annot* pWidget, FX_BOOL bSameField, FX_BOOL bNext);
 
-private:
 	CPDFDoc_Environment*				m_pApp;
 	CFFL_Widget2Filler			m_Maps;
 	FX_BOOL						m_bNotifying;
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index 2091376c9c..88b3b1d42e 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -139,7 +139,7 @@ public:
 	void							ResetAppearance(const FX_WCHAR* sValue, FX_BOOL bValueChanged);
 	void							ResetFieldAppearance(FX_BOOL bValueChanged);
 	void							UpdateField();
-	CFX_WideString					OnFormat(int nCommitKey, FX_BOOL& bFormated);
+	CFX_WideString					OnFormat(FX_BOOL& bFormated);
 	
 //Message.
  	FX_BOOL							OnAAction(CPDF_AAction::AActionType type, PDFSDK_FieldAction& data, 
@@ -264,7 +264,7 @@ public:
 	void							OnKeyStrokeCommit(CPDF_FormField* pFormField, CFX_WideString& csValue, FX_BOOL& bRC);
 	void							OnValidate(CPDF_FormField* pFormField, CFX_WideString& csValue, FX_BOOL& bRC);
 	void							OnCalculate(CPDF_FormField* pFormField = NULL);
-	CFX_WideString					OnFormat(CPDF_FormField* pFormField, int nCommitKey, FX_BOOL& bFormated);
+	CFX_WideString					OnFormat(CPDF_FormField* pFormField, FX_BOOL& bFormated);
 	
 	void							ResetFieldAppearance(CPDF_FormField* pFormField, const FX_WCHAR* sValue, FX_BOOL bValueChanged);
 	void							UpdateField(CPDF_FormField* pFormField);
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index d62b68bf50..d40c87b1f5 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -44,8 +44,8 @@ public:
 	virtual void				OnField_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget, const CFX_WideString& Value) = 0;
 
 	virtual void				OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL& bRc) = 0;
-	virtual void				OnField_Format(int nCommitKey, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit) = 0;
-	virtual void				OnField_Keystroke(int nCommitKey, CFX_WideString& strChange, const CFX_WideString& strChangeEx,
+	virtual void				OnField_Format(CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit) = 0;
+	virtual void				OnField_Keystroke(CFX_WideString& strChange, const CFX_WideString& strChangeEx,
 									FX_BOOL KeyDown, FX_BOOL bModifier, int &nSelEnd,int &nSelStart, FX_BOOL bShift,
 									CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit, 
 									FX_BOOL bFieldFull, FX_BOOL &bRc) = 0;
diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h
index 7d9dc2c9f1..f63b289992 100644
--- a/fpdfsdk/include/javascript/JS_Context.h
+++ b/fpdfsdk/include/javascript/JS_Context.h
@@ -47,8 +47,8 @@ public:
 	virtual void				OnField_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget, const CFX_WideString& Value);
 
 	virtual void				OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL& bRc);
-	virtual void				OnField_Format(int nCommitKey, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit);
-	virtual void				OnField_Keystroke(int nCommitKey, CFX_WideString& strChange, const CFX_WideString& strChangeEx,
+	virtual void				OnField_Format(CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit);
+	virtual void				OnField_Keystroke(CFX_WideString& strChange, const CFX_WideString& strChangeEx,
 									FX_BOOL bKeyDown, FX_BOOL bModifier, int &nSelEnd,int &nSelStart, FX_BOOL bShift,
 									CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit, 
 									FX_BOOL bFieldFull, FX_BOOL &bRc);
diff --git a/fpdfsdk/include/javascript/JS_EventHandler.h b/fpdfsdk/include/javascript/JS_EventHandler.h
index a99030734b..8389831970 100644
--- a/fpdfsdk/include/javascript/JS_EventHandler.h
+++ b/fpdfsdk/include/javascript/JS_EventHandler.h
@@ -80,8 +80,8 @@ public:
 	void					OnPage_OutView(CPDFSDK_Document* pTarget);
 	
 	void					OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL& bRc);
-	void					OnField_Format(int nCommitKey, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit);
-	void					OnField_Keystroke(int nCommitKey, CFX_WideString& strChange, const CFX_WideString& strChangeEx,
+	void					OnField_Format(CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit);
+	void					OnField_Keystroke(CFX_WideString& strChange, const CFX_WideString& strChangeEx,
 								FX_BOOL KeyDown, FX_BOOL bModifier, int &nSelEnd,int &nSelStart, FX_BOOL bShift,
 								CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit, 
 								FX_BOOL bFieldFull, FX_BOOL &bRc);