summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-11-08 21:30:11 -0800
committerCommit bot <commit-bot@chromium.org>2016-11-08 21:30:11 -0800
commit7b3252fa1f282c01707fc53d0ac347878dd0aebb (patch)
tree925f786341b650f1047e147688cb91f2c02e9a01
parentd0ecd899d632461bd6dc53e32b42bbd3a5d030ad (diff)
downloadpdfium-7b3252fa1f282c01707fc53d0ac347878dd0aebb.tar.xz
Fix regression in annotation key event handling.
BUG=chromium:663294 Review-Url: https://codereview.chromium.org/2482143002
-rw-r--r--fpdfsdk/cpdfsdk_annothandlermgr.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
index 0d252a47df..51ce88e21f 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
@@ -196,8 +196,9 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnKeyDown(CPDFSDK_Annot* pAnnot,
int nKeyCode,
int nFlag) {
if (m_pFormFillEnv->IsCTRLKeyDown(nFlag) ||
- m_pFormFillEnv->IsALTKeyDown(nFlag))
+ m_pFormFillEnv->IsALTKeyDown(nFlag)) {
return GetAnnotHandler(pAnnot)->OnKeyDown(pAnnot, nKeyCode, nFlag);
+ }
CPDFSDK_PageView* pPage = pAnnot->GetPageView();
CPDFSDK_Annot* pFocusAnnot = pPage->GetFocusAnnot();
@@ -210,7 +211,7 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnKeyDown(CPDFSDK_Annot* pAnnot,
}
}
- return false;
+ return GetAnnotHandler(pAnnot)->OnKeyDown(pAnnot, nKeyCode, nFlag);
}
bool CPDFSDK_AnnotHandlerMgr::Annot_OnKeyUp(CPDFSDK_Annot* pAnnot,