From b402b1738d665561dd1bb7ffba0c3f3d49425086 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 11 Oct 2016 09:26:32 -0700 Subject: Convert CPDFSDK_PageView to have a CPDFSDK_FormFillEnvironment This CL changes CPDFSDK_PageView to have a CPDFSDK_FormFillEnvironment instead of a CPDFSDK_Document. Review-Url: https://codereview.chromium.org/2400673002 --- fpdfsdk/cpdfsdk_annothandlermgr.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/cpdfsdk_annothandlermgr.cpp') diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp index 574efc1029..077c7faf54 100644 --- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp +++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp @@ -208,7 +208,7 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnKeyDown(CPDFSDK_Annot* pAnnot, CPDFSDK_Annot::ObservedPtr pNext( GetNextAnnot(pFocusAnnot, !m_pEnv->IsSHIFTKeyDown(nFlag))); if (pNext && pNext.Get() != pFocusAnnot) { - pPage->GetSDKDocument()->SetFocusAnnot(&pNext); + pPage->GetFormFillEnv()->GetSDKDocument()->SetFocusAnnot(&pNext); return TRUE; } } @@ -226,11 +226,7 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnSetFocus( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) { ASSERT(*pAnnot); - if (!GetAnnotHandler(pAnnot->Get())->OnSetFocus(pAnnot, nFlag)) - return FALSE; - - (*pAnnot)->GetPageView()->GetSDKDocument(); - return TRUE; + return GetAnnotHandler(pAnnot->Get())->OnSetFocus(pAnnot, nFlag); } FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnKillFocus( -- cgit v1.2.3