Merge to XFA: Introduce CPDFPageFromFPFDPage()

fpdfsdk/src/fpdfformfill.cpp

 // Copyright 2014 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 "../../public/fpdf_formfill.h"
 #include "../../public/fpdfview.h"
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
@@ skipping 24 matching lines @@
   CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
   return pSDKDoc ? pSDKDoc->GetPageView((CPDFXFA_Page*)page, TRUE) : nullptr;
 }
 
 }  // namespace
 
 DLLEXPORT int STDCALL FPDFPage_HasFormFieldAtPoint(FPDF_FORMHANDLE hHandle,
                                                    FPDF_PAGE page,
                                                    double page_x,
                                                    double page_y) {
-  if (!page || !hHandle)
+  if (!hHandle)
     return -1;
-
-  CPDF_Page* pPage = ((CPDFXFA_Page*)page)->GetPDFPage();
+  CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
   if (pPage) {
     CPDF_InterForm interform(pPage->m_pDocument, FALSE);
     CPDF_FormControl* pFormCtrl = interform.GetControlAtPoint(
         pPage, (FX_FLOAT)page_x, (FX_FLOAT)page_y, nullptr);
     if (!pFormCtrl)
       return -1;
 
     CPDF_FormField* pFormField = pFormCtrl->GetField();
     if (!pFormField)
       return -1;
@@ skipping 49 matching lines @@
                                                   FPDF_PAGE page,
                                                   double page_x,
                                                   double page_y) {
   return FPDFPage_HasFormFieldAtPoint(hHandle, page, page_x, page_y);
 }
 
 DLLEXPORT int STDCALL FPDFPage_FormFieldZOrderAtPoint(FPDF_FORMHANDLE hHandle,
                                                       FPDF_PAGE page,
                                                       double page_x,
                                                       double page_y) {
-  if (!page || !hHandle)
+  if (!hHandle)
     return -1;
-
-  CPDF_Page* pPage = (CPDF_Page*)page;

[Tom Sepez, 2015/10/16 00:18:55]

And this would be a bug in xfa.

[Lei Zhang, 2015/10/16 01:23:55]

I wonder why wrote that code... Hmmmm!

+  CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
+  if (!pPage)
+    return -1;
   CPDF_InterForm interform(pPage->m_pDocument, FALSE);
   int z_order = -1;
   (void)interform.GetControlAtPoint(pPage, (FX_FLOAT)page_x, (FX_FLOAT)page_y,
                                     &z_order);
   return z_order;
 }
 
 DLLEXPORT FPDF_FORMHANDLE STDCALL
 FPDFDOC_InitFormFillEnvironment(FPDF_DOCUMENT document,
                                 FPDF_FORMFILLINFO* formInfo) {
@@ skipping 127 matching lines @@
 
 DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle,
                                     FPDF_BITMAP bitmap,
                                     FPDF_PAGE page,
                                     int start_x,
                                     int start_y,
                                     int size_x,
                                     int size_y,
                                     int rotate,
                                     int flags) {
-  if (!hHandle || !page)
+  if (!hHandle)
     return;
 
-  CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
-  CPDFXFA_Document* pDocument = pPage->GetDocument();
+  CPDF_Page* pPage = CPDFPageFromFPDFPage(page);

[Tom Sepez, 2015/10/16 00:18:55]

wrong, fix it.

+  if (!pPage)
+    return;
+
+  CPDFXFA_Document* pDocument = ((CPDFXFA_Page*)pPage)->GetDocument();

[Lei Zhang, 2015/10/16 01:23:55]

No more C-style casts.

   if (!pDocument)
     return;
-  CPDF_Document* pPDFDoc = pDocument->GetPDFDoc();
-  if (!pPDFDoc)
-    return;
 
   CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle;
   CPDFSDK_Document* pFXDoc = pEnv->GetSDKDocument();
   if (!pFXDoc)
     return;
 
   CFX_AffineMatrix matrix;
   pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate);
 
   FX_RECT clip;
@@ skipping 305 matching lines @@
 }
 
 DLLEXPORT void STDCALL FORM_OnAfterLoadPage(FPDF_PAGE page,
                                             FPDF_FORMHANDLE hHandle) {
   if (CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page))
     pPageView->SetValid(TRUE);
 }
 
 DLLEXPORT void STDCALL FORM_OnBeforeClosePage(FPDF_PAGE page,
                                               FPDF_FORMHANDLE hHandle) {
-  if (!hHandle || !page)
+  if (!hHandle)

[Tom Sepez, 2015/10/16 00:18:55]

wrong, fix.

[Lei Zhang, 2015/10/16 01:23:55]

We are ok with a NULL |page| ?

[Tom Sepez, 2015/10/16 16:58:54]

No, fixed.

     return;
 
   CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetSDKDocument();
   if (!pSDKDoc)
     return;
 
   CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
   CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
   if (pPageView) {
     pPageView->SetValid(FALSE);
@@ skipping 32 matching lines @@
         ((CPDFDoc_Environment*)hHandle)->GetActionHander();
     ASSERT(pActionHandler != NULL);
     pActionHandler->DoAction_Document(action, (CPDF_AAction::AActionType)aaType,
                                       pSDKDoc);
   }
 }
 
 DLLEXPORT void STDCALL FORM_DoPageAAction(FPDF_PAGE page,
                                           FPDF_FORMHANDLE hHandle,
                                           int aaType) {
-  if (!hHandle || !page)
+  if (!hHandle)
     return;
   CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetSDKDocument();
   CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
+  if (!pPage)
+    return;
   CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
   if (pPageView) {
     CPDFDoc_Environment* pEnv = pSDKDoc->GetEnv();
     CPDFSDK_ActionHandler* pActionHandler = pEnv->GetActionHander();
     CPDF_Dictionary* pPageDict = pPage->GetPDFPage()->m_pFormDict;
     CPDF_AAction aa = pPageDict->GetDict(FX_BSTRC("AA"));
 
     FX_BOOL bExistOAAction = FALSE;
     FX_BOOL bExistCAAction = FALSE;
     if (FPDFPAGE_AACTION_OPEN == aaType) {
       bExistOAAction = aa.ActionExist(CPDF_AAction::OpenPage);
       if (bExistOAAction) {
         CPDF_Action action = aa.GetAction(CPDF_AAction::OpenPage);
         pActionHandler->DoAction_Page(action, CPDF_AAction::OpenPage, pSDKDoc);
       }
     } else {
       bExistCAAction = aa.ActionExist(CPDF_AAction::ClosePage);
       if (bExistCAAction) {
         CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
         pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
       }
     }
   }
 }