diff options
author | tsepez <tsepez@chromium.org> | 2016-03-25 14:52:27 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 14:52:28 -0700 |
commit | c3255f55954b2adc3edbd3269c0a8779f7d4b7ad (patch) | |
tree | 802c0e9158e14f1e67ad181089739a176e8fba24 /fpdfsdk/fpdfxfa | |
parent | deee3d2ee201d62e7ef41e7d8378d7f52e057a9c (diff) | |
download | pdfium-c3255f55954b2adc3edbd3269c0a8779f7d4b7ad.tar.xz |
Remove FX_DWORD from fpdfsdk/ and testing
BUG=
Review URL: https://codereview.chromium.org/1835693002
Diffstat (limited to 'fpdfsdk/fpdfxfa')
-rw-r--r-- | fpdfsdk/fpdfxfa/fpdfxfa_app.cpp | 8 | ||||
-rw-r--r-- | fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp | 12 | ||||
-rw-r--r-- | fpdfsdk/fpdfxfa/fpdfxfa_util.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index ea3a1c97c4..cdc1949d46 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -134,7 +134,7 @@ void CPDFXFA_App::GetVersion(CFX_WideString& wsVersion) { wsVersion = JS_STR_VIEWERVERSION_XFA; } -void CPDFXFA_App::Beep(FX_DWORD dwType) { +void CPDFXFA_App::Beep(uint32_t dwType) { CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0); if (pEnv) { pEnv->JS_appBeep(dwType); @@ -143,13 +143,13 @@ void CPDFXFA_App::Beep(FX_DWORD dwType) { int32_t CPDFXFA_App::MsgBox(const CFX_WideStringC& wsMessage, const CFX_WideStringC& wsTitle, - FX_DWORD dwIconType, - FX_DWORD dwButtonType) { + uint32_t dwIconType, + uint32_t dwButtonType) { CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0); if (!pEnv) return -1; - FX_DWORD iconType = 0; + uint32_t iconType = 0; int iButtonType = 0; switch (dwIconType) { case XFA_MBICON_Error: diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp index cee81daa62..ac2e77becb 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp @@ -233,7 +233,7 @@ FX_BOOL CPDFXFA_Document::GetChangeMark(IXFA_Doc* hDoc) { void CPDFXFA_Document::InvalidateRect(IXFA_PageView* pPageView, const CFX_RectF& rt, - FX_DWORD dwFlags /* = 0 */) { + uint32_t dwFlags /* = 0 */) { if (!m_pXFADoc || !m_pSDKDoc) return; @@ -257,7 +257,7 @@ void CPDFXFA_Document::InvalidateRect(IXFA_PageView* pPageView, } void CPDFXFA_Document::InvalidateRect(IXFA_Widget* hWidget, - FX_DWORD dwFlags /* = 0 */) { + uint32_t dwFlags /* = 0 */) { if (!hWidget) return; @@ -355,7 +355,7 @@ FX_BOOL CPDFXFA_Document::GetPopupPos(IXFA_Widget* hWidget, rcAnchor.bottom = rtAnchor.top; int t1, t2, t; - FX_DWORD dwPos; + uint32_t dwPos; FX_FLOAT fPoupHeight; switch (nRotate) { case 90: { @@ -489,7 +489,7 @@ FX_BOOL CPDFXFA_Document::PopupMenu(IXFA_Widget* hWidget, } void CPDFXFA_Document::PageViewEvent(IXFA_PageView* pPageView, - FX_DWORD dwFlags) { + uint32_t dwFlags) { CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); if (!pEnv) return; @@ -526,7 +526,7 @@ void CPDFXFA_Document::PageViewEvent(IXFA_PageView* pPageView, void CPDFXFA_Document::WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, - FX_DWORD dwEvent, + uint32_t dwEvent, void* pParam, void* pAdditional) { if (m_iDocType != DOCTYPE_DYNAMIC_XFA || !hWidget) @@ -788,7 +788,7 @@ void CPDFXFA_Document::SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget) { void CPDFXFA_Document::Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, - FX_DWORD dwOptions) { + uint32_t dwOptions) { if (hDoc != m_pXFADoc) return; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp index 7cabe0fb80..49efceb8e4 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp @@ -14,7 +14,7 @@ std::vector<CFWL_TimerInfo*>* CXFA_FWLAdapterTimerMgr::s_TimerArray = nullptr; FWL_ERR CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer, - FX_DWORD dwElapse, + uint32_t dwElapse, FWL_HTIMER& hTimer, FX_BOOL bImmediately) { if (!m_pEnv) |