diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-03 23:26:09 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-03 23:26:09 -0700 |
| commit | 8c217c537fc845763018a5d81a8c55b1045f6ccd (patch) | |
| tree | c75d60c856e518e36ccd54230cf01935dad07e20 /fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | |
| parent | 68bce6cfb69bfdfa9fc75f99d048cd7dbee79ff2 (diff) | |
| download | pdfium-8c217c537fc845763018a5d81a8c55b1045f6ccd.tar.xz | |
Merge to XFA: Do not call into formfiller code with a NULL PageView.
BUG=537173
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1376093002 .
(cherry picked from commit ac67d4765a8ac36cd00c9fc8b6f2b80a3e1cff72)
Review URL: https://codereview.chromium.org/1378193006 .
Diffstat (limited to 'fpdfsdk/src/formfiller/FFL_IFormFiller.cpp')
| -rw-r--r-- | fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index aaed794db8..c1450f6c84 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -463,7 +463,7 @@ FX_BOOL CFFL_IFormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { } if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, TRUE)) - return pFormFiller->SetFocusForAnnot(pAnnot, nFlag); + pFormFiller->SetFocusForAnnot(pAnnot, nFlag); return TRUE; } @@ -474,8 +474,7 @@ FX_BOOL CFFL_IFormFiller::OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) { - if (!pFormFiller->KillFocusForAnnot(pAnnot, nFlag)) - return FALSE; + pFormFiller->KillFocusForAnnot(pAnnot, nFlag); if (!m_bNotifying) { CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; |