Cleanup some param passing code

This CL cleans up some of the code around passing input information
around.

Change-Id: Id3c1ffa93c9e50c3b6312b15533ccc32c7406264
Reviewed-on: https://pdfium-review.googlesource.com/24710
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

4 files changed, 27 insertions, 30 deletions

diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index d0eaa7adc8..1496beeb8e 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -240,7 +240,7 @@ bool CPDFSDK_Widget::OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT,
   CXFA_EventParam param;
   param.m_eType = eEventType;
   param.m_wsChange = data->sChange;
-  param.m_iCommitKey = data->nCommitKey;
+  param.m_iCommitKey = 0;
   param.m_bShift = data->bShift;
   param.m_iSelStart = data->nSelStart;
   param.m_iSelEnd = data->nSelEnd;
@@ -845,7 +845,7 @@ bool CPDFSDK_Widget::OnAAction(CPDF_AAction::AActionType type,
         CXFA_EventParam param;
         param.m_eType = eEventType;
         param.m_wsChange = data->sChange;
-        param.m_iCommitKey = data->nCommitKey;
+        param.m_iCommitKey = 0;
         param.m_bShift = data->bShift;
         param.m_iSelStart = data->nSelStart;
         param.m_iSelEnd = data->nSelEnd;
diff --git a/fpdfsdk/pdfsdk_fieldaction.cpp b/fpdfsdk/pdfsdk_fieldaction.cpp
index 61228ea82a..ecf01b7488 100644
--- a/fpdfsdk/pdfsdk_fieldaction.cpp
+++ b/fpdfsdk/pdfsdk_fieldaction.cpp
@@ -9,7 +9,6 @@
 PDFSDK_FieldAction::PDFSDK_FieldAction()
     : bModifier(false),
       bShift(false),
-      nCommitKey(0),
       bKeyDown(false),
       nSelEnd(0),
       nSelStart(0),
diff --git a/fpdfsdk/pdfsdk_fieldaction.h b/fpdfsdk/pdfsdk_fieldaction.h
index aec5dcaa27..27049892a3 100644
--- a/fpdfsdk/pdfsdk_fieldaction.h
+++ b/fpdfsdk/pdfsdk_fieldaction.h
@@ -24,7 +24,6 @@ struct PDFSDK_FieldAction {
 
   bool bModifier;
   bool bShift;
-  int nCommitKey;
   WideString sChange;
   WideString sChangeEx;
   bool bKeyDown;
diff --git a/fxjs/xfa/cjx_eventpseudomodel.cpp b/fxjs/xfa/cjx_eventpseudomodel.cpp
index 3b2d9777d0..1362a326ec 100644
--- a/fxjs/xfa/cjx_eventpseudomodel.cpp
+++ b/fxjs/xfa/cjx_eventpseudomodel.cpp
@@ -17,28 +17,28 @@
 
 namespace {
 
-void StringProperty(CFXJSE_Value* pValue, WideString& wsValue, bool bSetting) {
+void StringProperty(CFXJSE_Value* pValue, WideString* wsValue, bool bSetting) {
   if (bSetting) {
-    wsValue = pValue->ToWideString();
+    *wsValue = pValue->ToWideString();
     return;
   }
-  pValue->SetString(wsValue.UTF8Encode().AsStringView());
+  pValue->SetString(wsValue->UTF8Encode().AsStringView());
 }
 
-void InterProperty(CFXJSE_Value* pValue, int32_t& iValue, bool bSetting) {
+void InterProperty(CFXJSE_Value* pValue, int32_t* iValue, bool bSetting) {
   if (bSetting) {
-    iValue = pValue->ToInteger();
+    *iValue = pValue->ToInteger();
     return;
   }
-  pValue->SetInteger(iValue);
+  pValue->SetInteger(*iValue);
 }
 
-void BooleanProperty(CFXJSE_Value* pValue, bool& bValue, bool bSetting) {
+void BooleanProperty(CFXJSE_Value* pValue, bool* bValue, bool bSetting) {
   if (bSetting) {
-    bValue = pValue->ToBoolean();
+    *bValue = pValue->ToBoolean();
     return;
   }
-  pValue->SetBoolean(bValue);
+  pValue->SetBoolean(*bValue);
 }
 
 }  // namespace
@@ -201,55 +201,54 @@ void CJX_EventPseudoModel::Property(CFXJSE_Value* pValue,
 
   switch (dwFlag) {
     case XFA_Event::CancelAction:
-      BooleanProperty(pValue, pEventParam->m_bCancelAction, bSetting);
+      BooleanProperty(pValue, &pEventParam->m_bCancelAction, bSetting);
       break;
     case XFA_Event::Change:
-      StringProperty(pValue, pEventParam->m_wsChange, bSetting);
+      StringProperty(pValue, &pEventParam->m_wsChange, bSetting);
       break;
     case XFA_Event::CommitKey:
-      InterProperty(pValue, pEventParam->m_iCommitKey, bSetting);
+      InterProperty(pValue, &pEventParam->m_iCommitKey, bSetting);
       break;
     case XFA_Event::FullText:
-      StringProperty(pValue, pEventParam->m_wsFullText, bSetting);
+      StringProperty(pValue, &pEventParam->m_wsFullText, bSetting);
       break;
     case XFA_Event::Keydown:
-      BooleanProperty(pValue, pEventParam->m_bKeyDown, bSetting);
+      BooleanProperty(pValue, &pEventParam->m_bKeyDown, bSetting);
       break;
     case XFA_Event::Modifier:
-      BooleanProperty(pValue, pEventParam->m_bModifier, bSetting);
+      BooleanProperty(pValue, &pEventParam->m_bModifier, bSetting);
       break;
     case XFA_Event::NewContentType:
-      StringProperty(pValue, pEventParam->m_wsNewContentType, bSetting);
+      StringProperty(pValue, &pEventParam->m_wsNewContentType, bSetting);
       break;
     case XFA_Event::NewText:
-      StringProperty(pValue, pEventParam->m_wsNewText, bSetting);
+      StringProperty(pValue, &pEventParam->m_wsNewText, bSetting);
       break;
     case XFA_Event::PreviousContentType:
-      StringProperty(pValue, pEventParam->m_wsPrevContentType, bSetting);
+      StringProperty(pValue, &pEventParam->m_wsPrevContentType, bSetting);
       break;
     case XFA_Event::PreviousText:
-      StringProperty(pValue, pEventParam->m_wsPrevText, bSetting);
+      StringProperty(pValue, &pEventParam->m_wsPrevText, bSetting);
       break;
     case XFA_Event::Reenter:
-      BooleanProperty(pValue, pEventParam->m_bReenter, bSetting);
+      BooleanProperty(pValue, &pEventParam->m_bReenter, bSetting);
       break;
     case XFA_Event::SelectionEnd:
-      InterProperty(pValue, pEventParam->m_iSelEnd, bSetting);
+      InterProperty(pValue, &pEventParam->m_iSelEnd, bSetting);
       break;
     case XFA_Event::SelectionStart:
-      InterProperty(pValue, pEventParam->m_iSelStart, bSetting);
+      InterProperty(pValue, &pEventParam->m_iSelStart, bSetting);
       break;
     case XFA_Event::Shift:
-      BooleanProperty(pValue, pEventParam->m_bShift, bSetting);
+      BooleanProperty(pValue, &pEventParam->m_bShift, bSetting);
       break;
     case XFA_Event::SoapFaultCode:
-      StringProperty(pValue, pEventParam->m_wsSoapFaultCode, bSetting);
+      StringProperty(pValue, &pEventParam->m_wsSoapFaultCode, bSetting);
       break;
     case XFA_Event::SoapFaultString:
-      StringProperty(pValue, pEventParam->m_wsSoapFaultString, bSetting);
+      StringProperty(pValue, &pEventParam->m_wsSoapFaultString, bSetting);
       break;
     case XFA_Event::Target:
-      break;
     default:
       break;
   }