Merge to XFA: Use stdint.h types throughout PDFium.

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 "../../../public/fpdf_formfill.h"
 #include "../../include/fsdk_define.h"
 #include "../../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../../include/fsdk_mgr.h"
@@ skipping 615 matching lines @@
         else if (dwEvent == XFA_WIDGETEVENT_PreRemoved)
         {       
                 CPDFSDK_Annot* pAnnot = pSdkPageView->GetAnnotByXFAWidget(hWidget);
                 if (pAnnot) {
                         pSdkPageView->DeleteAnnot(pAnnot);
                         //pEnv->FFI_WidgetEvent(hWidget, XFA_WIDGETEVENT_PreRemoved);
                 }
         }
 }
 
-FX_INT32 CPDFXFA_Document::CountPages(IXFA_Doc* hDoc)
+int32_t CPDFXFA_Document::CountPages(IXFA_Doc* hDoc)
 {
         if (hDoc == m_pXFADoc && m_pSDKDoc)
         {
                 return GetPageCount();
         }
         return 0;
 }
-FX_INT32 CPDFXFA_Document::GetCurrentPage(IXFA_Doc* hDoc)
+int32_t CPDFXFA_Document::GetCurrentPage(IXFA_Doc* hDoc)
 {
         if (hDoc != m_pXFADoc || !m_pSDKDoc)
                 return -1;
         if (m_iDocType != DOCTYPE_DYNIMIC_XFA)
                 return -1;
 
         
         CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
         if (pEnv == NULL)
                 return -1;
 
         return pEnv->FFI_GetCurrentPageIndex(this);
 }
-void CPDFXFA_Document::SetCurrentPage(IXFA_Doc* hDoc, FX_INT32 iCurPage)
+void CPDFXFA_Document::SetCurrentPage(IXFA_Doc* hDoc, int32_t iCurPage)
 {
         if (hDoc != m_pXFADoc || !m_pSDKDoc)
                 return;
         if (m_iDocType != DOCTYPE_DYNIMIC_XFA)
                 return;
                 
         CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
         if (pEnv == NULL)
                 return;
 
@@ skipping 220 matching lines @@
                 CPDFSDK_PageView* pPageView = m_pSDKDoc->GetPageView(i);
                 if (pPageView == NULL)
                         continue;
                 CPDFSDK_Annot* pAnnot = pPageView->GetAnnotByXFAWidget(hWidget);
                 if (pAnnot) {
                         m_pSDKDoc->SetFocusAnnot(pAnnot);
                         break;
                 }
         }
 }
-void CPDFXFA_Document::Print(IXFA_Doc* hDoc, FX_INT32 nStartPage, FX_INT32 nEndPage, FX_DWORD dwOptions)
+void CPDFXFA_Document::Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, FX_DWORD dwOptions)
 {
         if (hDoc != m_pXFADoc)
                 return;
                 
         CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
         if (pEnv == NULL)
                 return;
 
         if (!pEnv->GetFormFillInfo() || pEnv->GetFormFillInfo()->m_pJsPlatform == NULL)
                 return;
@@ skipping 18 matching lines @@
 
 FX_ARGB CPDFXFA_Document::GetHighlightColor(IXFA_Doc* hDoc)
 {
         if (hDoc != m_pXFADoc)
                 return 0;
         if (m_pSDKDoc)
         {
                 if(CPDFSDK_InterForm* pInterForm = m_pSDKDoc->GetInterForm())
                 {
                         FX_COLORREF color = pInterForm->GetHighlightColor(FPDF_FORMFIELD_XFA);
-                        FX_BYTE alpha = pInterForm->GetHighlightAlpha();
+                        uint8_t alpha = pInterForm->GetHighlightAlpha();
                         FX_ARGB argb = ArgbEncode((int)alpha, color);
                         return argb;
                 }       
         }
         return 0;
 }
 
 void CPDFXFA_Document::AddDoRecord(IXFA_Widget* hWidget)
 {
         CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
@@ skipping 483 matching lines @@
         }
 
         return _GetHValueByName(szPropName, hValue, m_pSDKDoc->GetEnv()->GetJSRuntime());
 
 }
 FX_BOOL CPDFXFA_Document::_GetHValueByName(FX_BSTR utf8Name, FXJSE_HVALUE hValue, IFXJS_Runtime* runTime)
 {
         return runTime->GetHValueByName(utf8Name, hValue);
 }