commit b402b1738d665561dd1bb7ffba0c3f3d49425086
author dsinclair <dsinclair@chromium.org> Tue Oct 11 09:26:32 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 11 09:26:32 2016 -0700
tree b7542f810c1d9199179dc60e5cdd43a5c794b880
parent 690c033e86b34f7a9c3d4be15759c63ef9360217

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

diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
index 574efc1..077c7fa 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
@@ -208,7 +208,7 @@
     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 @@
     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(