diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-10 15:23:23 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-10 15:23:23 -0700 |
| commit | 0aa0e7331b3512066df3e33d6642456a0de63de7 (patch) | |
| tree | beb51a4f1d45c4acdf4133fd3fef81fad4e35594 /fpdfsdk/include/javascript | |
| parent | 71b0378c7ce0bf8bfa54eddb2c2734729bae27f1 (diff) | |
| download | pdfium-0aa0e7331b3512066df3e33d6642456a0de63de7.tar.xz | |
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.
Diffstat (limited to 'fpdfsdk/include/javascript')
| -rw-r--r-- | fpdfsdk/include/javascript/IJavaScript.h | 4 | ||||
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Context.h | 4 | ||||
| -rw-r--r-- | fpdfsdk/include/javascript/JS_EventHandler.h | 4 |
3 files changed, 6 insertions, 6 deletions
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); |