Convert CPDFSDK_PageView to have a CPDFSDK_FormFillEnvironment

fpdfsdk/cpdfsdk_xfawidgethandler.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/cpdfsdk_xfawidgethandler.h"
 
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
@@ skipping 36 matching lines @@
 }
 
 void CPDFSDK_XFAWidgetHandler::OnDraw(CPDFSDK_PageView* pPageView,
                                       CPDFSDK_Annot* pAnnot,
                                       CFX_RenderDevice* pDevice,
                                       CFX_Matrix* pUser2Device,
                                       bool bDrawAnnots) {
   ASSERT(pPageView);
   ASSERT(pAnnot);
 
-  CPDFSDK_Document* pSDKDoc = pPageView->GetSDKDocument();
-  CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
-
   CFX_Graphics gs;
   gs.Create(pDevice);
 
   CFX_Matrix mt;
   mt = *pUser2Device;
 
   FX_BOOL bIsHighlight = FALSE;
-  if (pSDKDoc->GetFocusAnnot() != pAnnot)
+  if (pPageView->GetFormFillEnv()->GetSDKDocument()->GetFocusAnnot() != pAnnot)
     bIsHighlight = TRUE;
 
-  pWidgetHandler->RenderWidget(pAnnot->GetXFAWidget(), &gs, &mt, bIsHighlight);
+  GetXFAWidgetHandler(pAnnot)->RenderWidget(pAnnot->GetXFAWidget(), &gs, &mt,
+                                            bIsHighlight);
 
   // to do highlight and shadow
 }
 
 void CPDFSDK_XFAWidgetHandler::OnCreate(CPDFSDK_Annot* pAnnot) {}
 
 void CPDFSDK_XFAWidgetHandler::OnLoad(CPDFSDK_Annot* pAnnot) {}
 
 void CPDFSDK_XFAWidgetHandler::OnDelete(CPDFSDK_Annot* pAnnot) {}
 
@@ skipping 28 matching lines @@
   rcWidget.top += 1.0f;
 
   return rcWidget;
 }
 
 FX_BOOL CPDFSDK_XFAWidgetHandler::HitTest(CPDFSDK_PageView* pPageView,
                                           CPDFSDK_Annot* pAnnot,
                                           const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
-
-  CPDFSDK_Document* pSDKDoc = pPageView->GetSDKDocument();
-  if (!pSDKDoc)
+  if (!pPageView->GetFormFillEnv()->GetSDKDocument())

[Tom Sepez, 2016/10/06 18:46:28]

really want local here.

[dsinclair, 2016/10/06 19:32:55]

Added one for the FormFillEnv.

     return FALSE;
 
-  CPDFXFA_Document* pDoc = pSDKDoc->GetXFADocument();
+  CPDFXFA_Document* pDoc =
+      pPageView->GetFormFillEnv()->GetSDKDocument()->GetXFADocument();
   if (!pDoc)
     return FALSE;
 
   CXFA_FFDocView* pDocView = pDoc->GetXFADocView();
   if (!pDocView)
     return FALSE;
 
   CXFA_FFWidgetHandler* pWidgetHandler = pDocView->GetWidgetHandler();
   if (!pWidgetHandler)
     return FALSE;
@@ skipping 203 matching lines @@
 }
 
 CXFA_FFWidgetHandler* CPDFSDK_XFAWidgetHandler::GetXFAWidgetHandler(
     CPDFSDK_Annot* pAnnot) {
   if (!pAnnot)
     return nullptr;
 
   CPDFSDK_PageView* pPageView = pAnnot->GetPageView();
   if (!pPageView)
     return nullptr;
-
-  CPDFSDK_Document* pSDKDoc = pPageView->GetSDKDocument();
-  if (!pSDKDoc)
+  if (!pPageView->GetFormFillEnv()->GetSDKDocument())

[Tom Sepez, 2016/10/06 18:46:28]

ditto

[dsinclair, 2016/10/06 19:32:55]

Done.

     return nullptr;
 
-  CPDFXFA_Document* pDoc = pSDKDoc->GetXFADocument();
+  CPDFXFA_Document* pDoc =
+      pPageView->GetFormFillEnv()->GetSDKDocument()->GetXFADocument();
   if (!pDoc)
     return nullptr;
 
   CXFA_FFDocView* pDocView = pDoc->GetXFADocView();
   if (!pDocView)
     return nullptr;
 
   return pDocView->GetWidgetHandler();
 }
 
@@ skipping 15 matching lines @@
     dwFWLFlag |= FWL_KEYFLAG_MButton;
   if (dwFlag & FWL_EVENTFLAG_RightButtonDown)
     dwFWLFlag |= FWL_KEYFLAG_RButton;
   if (dwFlag & FWL_EVENTFLAG_ShiftKey)
     dwFWLFlag |= FWL_KEYFLAG_Shift;
   if (dwFlag & FWL_EVENTFLAG_AltKey)
     dwFWLFlag |= FWL_KEYFLAG_Alt;
 
   return dwFWLFlag;
 }