Re-land "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/fpdfxfa/fpdfxfa_doc.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 "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
@@ skipping 174 matching lines @@
 }
 
 CPDFSDK_Document* CPDFXFA_Document::GetSDKDocument(
     CPDFDoc_Environment* pFormFillEnv) {
   if (!m_pSDKDoc && pFormFillEnv)
     m_pSDKDoc = new CPDFSDK_Document(this, pFormFillEnv);
   return m_pSDKDoc;
 }
 
 void CPDFXFA_Document::FXRect2PDFRect(const CFX_RectF& fxRectF,
-                                      CPDF_Rect& pdfRect) {
+                                      CFX_FloatRect& pdfRect) {
   pdfRect.left = fxRectF.left;
   pdfRect.top = fxRectF.bottom();
   pdfRect.right = fxRectF.right();
   pdfRect.bottom = fxRectF.top;
 }
 
 void CPDFXFA_Document::SetChangeMark(IXFA_Doc* hDoc) {
   if (hDoc == m_pXFADoc && m_pSDKDoc) {
     m_pSDKDoc->SetChangeMark();
   }
 }
 
 FX_BOOL CPDFXFA_Document::GetChangeMark(IXFA_Doc* hDoc) {
   if (hDoc == m_pXFADoc && m_pSDKDoc)
     return m_pSDKDoc->GetChangeMark();
   return FALSE;
 }
 
 void CPDFXFA_Document::InvalidateRect(IXFA_PageView* pPageView,
                                       const CFX_RectF& rt,
                                       FX_DWORD dwFlags /* = 0 */) {
   if (!m_pXFADoc || !m_pSDKDoc)
     return;
 
   if (m_iDocType != DOCTYPE_DYNAMIC_XFA)
     return;
 
-  CPDF_Rect rcPage;
+  CFX_FloatRect rcPage;
   FXRect2PDFRect(rt, rcPage);
 
   CPDFXFA_Page* pPage = GetPage(pPageView);
 
   if (pPage == NULL)
     return;
 
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   if (!pEnv)
     return;
@@ skipping 44 matching lines @@
 
   IXFA_PageView* pPageView = pWidgetHandler->GetPageView(hWidget);
   if (!pPageView)
     return;
 
   CPDFXFA_Page* pPage = GetPage(pPageView);
 
   if (pPage == NULL)
     return;
 
-  CPDF_Rect rcCaret;
+  CFX_FloatRect rcCaret;
   FXRect2PDFRect(*pRtAnchor, rcCaret);
 
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   if (!pEnv)
     return;
 
   pEnv->FFI_DisplayCaret((FPDF_PAGE)pPage, bVisible, rcCaret.left, rcCaret.top,
                          rcCaret.right, rcCaret.bottom);
 }
 
@@ skipping 21 matching lines @@
 #ifdef PDF_ENABLE_XFA
   nRotate = pWidgetAcc->GetRotate();
 #endif
 
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   if (pEnv == NULL)
     return FALSE;
   FS_RECTF pageViewRect;
   pEnv->FFI_GetPageViewRect(pPage, pageViewRect);
 
-  CPDF_Rect rcAnchor;
+  CFX_FloatRect rcAnchor;
 
   rcAnchor.left = rtAnchor.left;
   rcAnchor.top = rtAnchor.bottom();
   rcAnchor.right = rtAnchor.right();
   rcAnchor.bottom = rtAnchor.top;
 
   int t1, t2, t;
   FX_DWORD dwPos;
   FX_FLOAT fPoupHeight;
   switch (nRotate) {
@@ skipping 908 matching lines @@
   }
 
   return _GetHValueByName(szPropName, hValue,
                           m_pSDKDoc->GetEnv()->GetJSRuntime());
 }
 FX_BOOL CPDFXFA_Document::_GetHValueByName(const CFX_ByteStringC& utf8Name,
                                            FXJSE_HVALUE hValue,
                                            IJS_Runtime* runTime) {
   return runTime->GetHValueByName(utf8Name, hValue);
 }