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.

12 files changed, 46 insertions, 135 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);
diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp
index 6f96d33da8..61fd04a0d7 100644
--- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp
+++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp
@@ -871,8 +871,7 @@ void CFFL_IFormFiller::OnKeyStrokeCommit(CPDFSDK_Widget* pWidget, CPDFSDK_PageVi
 			fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
  			fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
 			fa.bWillCommit = TRUE;
-			fa.nCommitKey = GetCommitKey();
-			fa.bKeyDown = GetKeyDown();
+			fa.bKeyDown = TRUE;
 			fa.bRC = TRUE;
 
 			CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, FALSE);
@@ -911,7 +910,7 @@ void CFFL_IFormFiller::OnValidate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPa
 			PDFSDK_FieldAction fa;
 			fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
  			fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
-			fa.bKeyDown = GetKeyDown();
+			fa.bKeyDown = TRUE;
 			fa.bRC = TRUE;
 
 			CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, FALSE);
@@ -968,7 +967,7 @@ void CFFL_IFormFiller::OnFormat(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPage
 		ASSERT(pInterForm != NULL);
 
 		FX_BOOL bFormated = FALSE;
-		CFX_WideString sValue = pInterForm->OnFormat(pWidget->GetFormField(), GetCommitKey(), bFormated);
+		CFX_WideString sValue = pInterForm->OnFormat(pWidget->GetFormField(), bFormated);
 
 //		bExit = !IsValidAnnot(m_pApp, pDocument, pDocView, pPageView, pWidget);
 
@@ -984,62 +983,6 @@ void CFFL_IFormFiller::OnFormat(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPage
 	}
 }
 
-// LRESULT CALLBACK CFFL_IFormFiller::FFL_WndProc(
-// 									  int code,       // hook code
-// 									  WPARAM wParam,  // virtual-key code
-// 									  LPARAM lParam   // keystroke-message information
-// 										)
-// {
-// 	if (code != HC_ACTION)
-// 	{
-// 		return CallNextHookEx (m_hookSheet, code, wParam, lParam);
-// 	}
-// 
-// 	FXSYS_memcpy(&g_Msg, (void*)lParam, sizeof(MSG));	
-// 
-// 	return 0;
-// }
-
-// MSG	CFFL_IFormFiller::GetLastMessage()
-// {
-// 	return g_Msg;
-// }
-
-int CFFL_IFormFiller::GetCommitKey()
-{
-//	MSG msg = CFFL_IFormFiller::GetLastMessage();
-
-	int nCommitKey = 0;
-// 	switch (msg.message)
-// 	{
-// 	case WM_LBUTTONDOWN:
-// 	case WM_LBUTTONUP:
-// 		nCommitKey = 1;
-// 		break;
-// 	case WM_KEYDOWN:
-// 		switch (msg.wParam)
-// 		{
-// 		case VK_RETURN:
-// 			nCommitKey = 2;
-// 			break;
-// 		case VK_TAB:
-// 			nCommitKey = 3;
-// 			break;
-// 		}
-// 		break;
-// 	}
-
-	return nCommitKey;
-}
-
-FX_BOOL CFFL_IFormFiller::GetKeyDown()
-{
-	return TRUE;
-// 	MSG msg = CFFL_IFormFiller::GetLastMessage();
-// 
-// 	return msg.message == WM_KEYDOWN || msg.message == WM_CHAR;
-}
-
 void CFFL_IFormFiller::OnClick(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit, FX_UINT nFlag)
 {
 	ASSERT(pWidget != NULL);
diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp
index d4276866d3..55abd73be7 100644
--- a/fpdfsdk/src/fsdk_actionhandler.cpp
+++ b/fpdfsdk/src/fsdk_actionhandler.cpp
@@ -654,7 +654,7 @@ void CPDFSDK_ActionHandler::RunFieldJavaScript(CPDFSDK_Document* pDocument, CPDF
 		pContext->OnField_Blur(data.bModifier, data.bShift, pFormField, data.sValue);
 		break;
 	case CPDF_AAction::KeyStroke:
-		pContext->OnField_Keystroke(data.nCommitKey, data.sChange, data.sChangeEx, data.bKeyDown,
+		pContext->OnField_Keystroke(data.sChange, data.sChangeEx, data.bKeyDown,
 			data.bModifier, data.nSelEnd, data.nSelStart, data.bShift, pFormField, data.sValue,
 			data.bWillCommit, data.bFieldFull, data.bRC);
 		break;
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index 302cec597b..ba2478ad00 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -739,7 +739,7 @@ void CPDFSDK_BFAnnotHandler::OnLoad(CPDFSDK_Annot* pAnnot)
 		if (nFieldType == FIELDTYPE_TEXTFIELD || nFieldType == FIELDTYPE_COMBOBOX)
 		{
 			FX_BOOL bFormated = FALSE;
-			CFX_WideString sValue = pWidget->OnFormat(0, bFormated);
+			CFX_WideString sValue = pWidget->OnFormat(bFormated);
 			if (bFormated && nFieldType == FIELDTYPE_COMBOBOX)
 			{
 				pWidget->ResetAppearance(sValue.c_str(), FALSE);
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp
index 037339f4ff..1744fb942c 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/src/fsdk_baseform.cpp
@@ -973,7 +973,7 @@ void CPDFSDK_Widget::ResetAppearance(FX_BOOL bValueChanged)
 	case FIELDTYPE_COMBOBOX:
 		{
 			FX_BOOL bFormated = FALSE;
-			CFX_WideString sValue = this->OnFormat(0, bFormated);
+			CFX_WideString sValue = this->OnFormat(bFormated);
 			if (bFormated)
 				this->ResetAppearance(sValue, TRUE);
 			else
@@ -1024,15 +1024,11 @@ void CPDFSDK_Widget::ResetAppearance(const FX_WCHAR* sValue, FX_BOOL bValueChang
 	m_pAnnot->ClearCachedAP();
 }
 
-CFX_WideString CPDFSDK_Widget::OnFormat(int nCommitKey, FX_BOOL& bFormated)
+CFX_WideString CPDFSDK_Widget::OnFormat(FX_BOOL& bFormated)
 {
- 	CPDF_FormField* pFormField = GetFormField();
- 	ASSERT(pFormField != NULL);
- 	
- 	ASSERT(m_pInterForm != NULL);
-	
-	return m_pInterForm->OnFormat(pFormField, nCommitKey, bFormated);
-
+    CPDF_FormField* pFormField = GetFormField();
+    ASSERT(pFormField != NULL);
+    return m_pInterForm->OnFormat(pFormField, bFormated);
 }
 
 void CPDFSDK_Widget::ResetFieldAppearance(FX_BOOL bValueChanged)
@@ -2747,7 +2743,7 @@ void CPDFSDK_InterForm::OnCalculate(CPDF_FormField* pFormField)
 	m_bBusy = FALSE;
 }
 
-CFX_WideString CPDFSDK_InterForm::OnFormat(CPDF_FormField* pFormField, int nCommitKey, FX_BOOL& bFormated)
+CFX_WideString CPDFSDK_InterForm::OnFormat(CPDF_FormField* pFormField, FX_BOOL& bFormated)
 {
 	ASSERT(m_pDocument != NULL);
 	ASSERT(pFormField != NULL);
@@ -2792,7 +2788,7 @@ CFX_WideString CPDFSDK_InterForm::OnFormat(CPDF_FormField* pFormField, int nComm
 				IFXJS_Context* pContext = pRuntime->NewContext();
 				ASSERT(pContext != NULL);
 
-				pContext->OnField_Format(nCommitKey, pFormField, Value, TRUE);
+				pContext->OnField_Format(pFormField, Value, TRUE);
 			
 				CFX_WideString sInfo;
  				FX_BOOL bRet = pContext->RunScript(script, sInfo);
@@ -3307,7 +3303,7 @@ int	CPDFSDK_InterForm::AfterValueChange(const CPDF_FormField* pField)
 	{
 		this->OnCalculate(pFormField);
 		FX_BOOL bFormated = FALSE;
-		CFX_WideString sValue = this->OnFormat(pFormField, 0, bFormated);
+		CFX_WideString sValue = this->OnFormat(pFormField, bFormated);
 		if (bFormated)
 			this->ResetFieldAppearance(pFormField, sValue.c_str(), TRUE);
 		else
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp
index 52126bc54c..3c407b13d1 100644
--- a/fpdfsdk/src/javascript/Field.cpp
+++ b/fpdfsdk/src/javascript/Field.cpp
@@ -256,7 +256,7 @@ void Field::UpdateFormField(CPDFSDK_Document* pDocument, CPDF_FormField* pFormFi
 				ASSERT(pWidget != NULL);
 
 				FX_BOOL bFormated = FALSE;
-				CFX_WideString sValue = pWidget->OnFormat(0, bFormated);
+				CFX_WideString sValue = pWidget->OnFormat(bFormated);
 				if (bFormated)
 					pWidget->ResetAppearance(sValue.c_str(), FALSE);
 				else
@@ -313,7 +313,7 @@ void Field::UpdateFormControl(CPDFSDK_Document* pDocument, CPDF_FormControl* pFo
 			if (nFieldType == FIELDTYPE_COMBOBOX || nFieldType == FIELDTYPE_TEXTFIELD)
 			{
 				FX_BOOL bFormated = FALSE;
-				CFX_WideString sValue = pWidget->OnFormat(0, bFormated);
+				CFX_WideString sValue = pWidget->OnFormat(bFormated);
 				if (bFormated)
 					pWidget->ResetAppearance(sValue.c_str(), FALSE);
 				else
diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp
index 50f9f3cbb0..11bb092734 100644
--- a/fpdfsdk/src/javascript/JS_Context.cpp
+++ b/fpdfsdk/src/javascript/JS_Context.cpp
@@ -233,21 +233,20 @@ void CJS_Context::OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTa
 	m_pEventHandler->OnField_Calculate(pSource, pTarget, Value, bRc);
 }
 
-void CJS_Context::OnField_Format(int nCommitKey, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit)
+void CJS_Context::OnField_Format(CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit)
 {
-	ASSERT(m_pEventHandler != NULL);
-	m_pEventHandler->OnField_Format(nCommitKey, pTarget, Value, bWillCommit);
+    m_pEventHandler->OnField_Format(pTarget, Value, bWillCommit);
 }
 
 
-void CJS_Context::OnField_Keystroke(int nCommitKey, CFX_WideString& strChange, const CFX_WideString& strChangeEx,
+void CJS_Context::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)
 {
-	ASSERT(m_pEventHandler != NULL);
-	m_pEventHandler->OnField_Keystroke(nCommitKey, strChange, strChangeEx, bKeyDown,
-		bModifier, nSelEnd, nSelStart, bShift, pTarget, Value, bWillCommit, bFieldFull, bRc);
+    m_pEventHandler->OnField_Keystroke(
+        strChange, strChangeEx, bKeyDown, bModifier, nSelEnd, nSelStart,
+        bShift, pTarget, Value, bWillCommit, bFieldFull, bRc);
 }
 
 void CJS_Context::OnField_Validate(CFX_WideString& strChange,const CFX_WideString& strChangeEx,
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp
index fe4f6b2d4c..1fab82f74e 100644
--- a/fpdfsdk/src/javascript/JS_EventHandler.cpp
+++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp
@@ -188,7 +188,7 @@ void CJS_EventHandler::OnField_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDF_Form
 	m_pValue = (CFX_WideString*)&Value;	
 }
 
-void CJS_EventHandler::OnField_Keystroke(int nCommitKey, CFX_WideString &strChange,
+void CJS_EventHandler::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,
@@ -197,7 +197,7 @@ void CJS_EventHandler::OnField_Keystroke(int nCommitKey, CFX_WideString &strChan
 {
 	Initial(JET_FIELD_KEYSTROKE);
 	
-	m_nCommitKey = nCommitKey;
+	m_nCommitKey = 0;
 	m_pWideStrChange = &strChange;
 	m_WideStrChangeEx = strChangeEx;
 	m_bKeyDown = KeyDown;
@@ -243,12 +243,13 @@ void CJS_EventHandler::OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField
 	m_pbRc = &bRc;
 }
 
-void CJS_EventHandler::OnField_Format(int nCommitKey, CPDF_FormField* pTarget,
-									  CFX_WideString& Value, FX_BOOL bWillCommit)
+void CJS_EventHandler::OnField_Format(CPDF_FormField* pTarget,
+                                      CFX_WideString& Value,
+                                      FX_BOOL bWillCommit)
 {
 	Initial(JET_FIELD_FORMAT);
 	
-	m_nCommitKey = nCommitKey;	  
+	m_nCommitKey = 0;
 	ASSERT(pTarget != NULL);
 	m_strTargetName = pTarget->GetFullName();
 	m_pValue = &Value;