From cf3816187f6cbee5569a5924dc1ce1074ffcad7a Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Tue, 11 Oct 2016 14:11:16 -0700
Subject: Remove remaining CPDFSDK_Document references

Review-Url: https://codereview.chromium.org/2399213002
---
 fpdfsdk/formfiller/cffl_formfiller.cpp            |  7 +++----
 fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | 10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'fpdfsdk/formfiller')

diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index 6369b45d7e..e2e99c9a22 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -251,8 +251,8 @@ FX_BOOL CFFL_FormFiller::OnChar(CPDFSDK_Annot* pAnnot,
 void CFFL_FormFiller::SetFocusForAnnot(CPDFSDK_Annot* pAnnot, uint32_t nFlag) {
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
   UnderlyingPageType* pPage = pWidget->GetUnderlyingPage();
-  CPDFSDK_Document* pDoc = m_pEnv->GetSDKDocument();
-  CPDFSDK_PageView* pPageView = pDoc->GetPageView(pPage, true);
+  CPDFSDK_PageView* pPageView =
+      m_pEnv->GetSDKDocument()->GetPageView(pPage, true);
   if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, TRUE))
     pWnd->SetFocus();
 
@@ -458,8 +458,7 @@ CFX_FloatRect CFFL_FormFiller::GetPDFWindowRect() const {
 
 CPDFSDK_PageView* CFFL_FormFiller::GetCurPageView(bool renew) {
   UnderlyingPageType* pPage = m_pAnnot->GetUnderlyingPage();
-  CPDFSDK_Document* pSDKDoc = m_pEnv->GetSDKDocument();
-  return pSDKDoc ? pSDKDoc->GetPageView(pPage, renew) : nullptr;
+  return m_pEnv ? m_pEnv->GetSDKDocument()->GetPageView(pPage, renew) : nullptr;
 }
 
 CFX_FloatRect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) {
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index c62de9bfb5..27ad4faeb6 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -67,8 +67,7 @@ void CFFL_InteractiveFormFiller::OnDraw(CPDFSDK_PageView* pPageView,
       pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device);
       pAnnot->GetPDFPage();
 
-      CPDFSDK_Document* pDocument = m_pEnv->GetSDKDocument();
-      if (pDocument->GetFocusAnnot() == pAnnot) {
+      if (m_pEnv->GetSDKDocument()->GetFocusAnnot() == pAnnot) {
         CFX_FloatRect rcFocus = pFormFiller->GetFocusBox(pPageView);
         if (!rcFocus.IsEmpty()) {
           CFX_PathData path;
@@ -239,7 +238,6 @@ FX_BOOL CFFL_InteractiveFormFiller::OnLButtonUp(
     const CFX_FloatPoint& point) {
   ASSERT((*pAnnot)->GetPDFAnnot()->GetSubtype() == CPDF_Annot::Subtype::WIDGET);
   CPDFSDK_Widget* pWidget = static_cast<CPDFSDK_Widget*>(pAnnot->Get());
-  CPDFSDK_Document* pDocument = m_pEnv->GetSDKDocument();
 
   switch (pWidget->GetFieldType()) {
     case FIELDTYPE_PUSHBUTTON:
@@ -247,10 +245,10 @@ FX_BOOL CFFL_InteractiveFormFiller::OnLButtonUp(
     case FIELDTYPE_RADIOBUTTON:
       if (GetViewBBox(pPageView, pAnnot->Get())
               .Contains((int)point.x, (int)point.y))
-        pDocument->SetFocusAnnot(pAnnot);
+        m_pEnv->GetSDKDocument()->SetFocusAnnot(pAnnot);
       break;
     default:
-      pDocument->SetFocusAnnot(pAnnot);
+      m_pEnv->GetSDKDocument()->SetFocusAnnot(pAnnot);
       break;
   }
 
@@ -258,7 +256,7 @@ FX_BOOL CFFL_InteractiveFormFiller::OnLButtonUp(
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot->Get(), FALSE))
     bRet = pFormFiller->OnLButtonUp(pPageView, pAnnot->Get(), nFlags, point);
 
-  if (pDocument->GetFocusAnnot() == pAnnot->Get()) {
+  if (m_pEnv->GetSDKDocument()->GetFocusAnnot() == pAnnot->Get()) {
     FX_BOOL bExit = FALSE;
     FX_BOOL bReset = FALSE;
     OnButtonUp(pAnnot, pPageView, bReset, bExit, nFlags);
-- 
cgit v1.2.3