From 35c3163d55bebea8095474181f807ddfb2f4f806 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 Jun 2015 11:47:08 -0700 Subject: 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. --- fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 63 ++---------------------------- fpdfsdk/src/fsdk_actionhandler.cpp | 2 +- fpdfsdk/src/fsdk_annothandler.cpp | 2 +- fpdfsdk/src/fsdk_baseform.cpp | 18 ++++----- fpdfsdk/src/javascript/Field.cpp | 4 +- fpdfsdk/src/javascript/JS_Context.cpp | 13 +++--- fpdfsdk/src/javascript/JS_EventHandler.cpp | 11 +++--- 7 files changed, 26 insertions(+), 87 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index b2d80abc35..0066b7e9c6 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -868,8 +868,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); @@ -908,7 +907,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); @@ -965,7 +964,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); @@ -981,62 +980,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; -} - FX_BOOL CFFL_IFormFiller::IsValidAnnot(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot) { diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp index d4b2204f6c..1f61a8c797 100644 --- a/fpdfsdk/src/fsdk_actionhandler.cpp +++ b/fpdfsdk/src/fsdk_actionhandler.cpp @@ -653,7 +653,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 2027817497..a44b34b02f 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -673,7 +673,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 936d881780..c94da1d5cd 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -387,15 +387,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) @@ -1979,7 +1975,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); @@ -2024,7 +2020,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); @@ -2515,7 +2511,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 c4936e3799..a45e96682b 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 277abc08e5..362844509f 100644 --- a/fpdfsdk/src/javascript/JS_Context.cpp +++ b/fpdfsdk/src/javascript/JS_Context.cpp @@ -232,21 +232,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; -- cgit v1.2.3