summaryrefslogtreecommitdiff
path: root/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-09-15 15:43:11 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-09-15 22:54:34 +0000
commit7b1e53c0ef09da360304c6f4397082d09a945a7e (patch)
tree0167576535814d271950c4aea24071c4e7b6afce /fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
parent134ac9105586407eb3b1e06001101ff893dd4a31 (diff)
downloadpdfium-7b1e53c0ef09da360304c6f4397082d09a945a7e.tar.xz
Use unsigned types for app age, value age in widgets.chromium/3218chromium/3217
Then if they roll over, it doesn't matter, since we only check for change. And then we can pull a silly check. Then remove some no-op calls where we didn't use the result. Change-Id: I35ba470b42fb8c32a6984999e0311b21729791ca Reviewed-on: https://pdfium-review.googlesource.com/14210 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/formfiller/cffl_interactiveformfiller.cpp')
-rw-r--r--fpdfsdk/formfiller/cffl_interactiveformfiller.cpp35
1 files changed, 16 insertions, 19 deletions
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index 425c2add35..989539fad3 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -122,7 +122,7 @@ void CFFL_InteractiveFormFiller::OnMouseEnter(
if (pWidget->GetAAction(CPDF_AAction::CursorEnter).GetDict()) {
m_bNotifying = true;
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
pWidget->ClearAppModified();
ASSERT(pPageView);
@@ -154,9 +154,8 @@ void CFFL_InteractiveFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView,
CPDFSDK_Widget* pWidget = static_cast<CPDFSDK_Widget*>(pAnnot->Get());
if (pWidget->GetAAction(CPDF_AAction::CursorExit).GetDict()) {
m_bNotifying = true;
- pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
pWidget->ClearAppModified();
ASSERT(pPageView);
@@ -191,9 +190,8 @@ bool CFFL_InteractiveFormFiller::OnLButtonDown(
if (Annot_HitTest(pPageView, pAnnot->Get(), point) &&
pWidget->GetAAction(CPDF_AAction::ButtonDown).GetDict()) {
m_bNotifying = true;
- pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
pWidget->ClearAppModified();
ASSERT(pPageView);
@@ -271,8 +269,8 @@ bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot,
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
ASSERT(pPageView);
PDFSDK_FieldAction fa;
@@ -376,9 +374,8 @@ bool CFFL_InteractiveFormFiller::OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot,
CPDFSDK_Widget* pWidget = static_cast<CPDFSDK_Widget*>(pAnnot->Get());
if (pWidget->GetAAction(CPDF_AAction::GetFocus).GetDict()) {
m_bNotifying = true;
- pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
pWidget->ClearAppModified();
CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, true);
@@ -718,8 +715,8 @@ bool CFFL_InteractiveFormFiller::OnClick(CPDFSDK_Annot::ObservedPtr* pAnnot,
return false;
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
PDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
@@ -748,8 +745,8 @@ bool CFFL_InteractiveFormFiller::OnFull(CPDFSDK_Annot::ObservedPtr* pAnnot,
return false;
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
PDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
@@ -801,8 +798,8 @@ bool CFFL_InteractiveFormFiller::OnPreOpen(CPDFSDK_Annot::ObservedPtr* pAnnot,
return false;
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
PDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
@@ -832,8 +829,8 @@ bool CFFL_InteractiveFormFiller::OnPostOpen(CPDFSDK_Annot::ObservedPtr* pAnnot,
return false;
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
PDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
@@ -888,8 +885,8 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke(
CFX_AutoRestorer<bool> restorer(&m_bNotifying);
m_bNotifying = true;
- int nAge = privateData.pWidget->GetAppearanceAge();
- int nValueAge = privateData.pWidget->GetValueAge();
+ uint32_t nAge = privateData.pWidget->GetAppearanceAge();
+ uint32_t nValueAge = privateData.pWidget->GetValueAge();
CPDFSDK_FormFillEnvironment* pFormFillEnv =
privateData.pPageView->GetFormFillEnv();