From dfa2ac2378dd85459ab2d65c06b68643d97fd355 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 12 Jul 2018 19:06:50 +0000
Subject: Add a IsCheckBoxOrRadioButton() helper for CJS_Field.

Change-Id: I0e06d641d482cbcd2cf33f327d9504e55a772157
Reviewed-on: https://pdfium-review.googlesource.com/37672
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
---
 fxjs/cjs_field.cpp | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp
index 6f6455d984..00f1ce23db 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -62,6 +62,11 @@ bool SetWidgetDisplayStatus(CPDFSDK_Widget* pWidget, int value) {
   return false;
 }
 
+bool IsCheckBoxOrRadioButton(const CPDF_FormField* pFormField) {
+  return pFormField->GetFieldType() == FormFieldType::kCheckBox ||
+         pFormField->GetFieldType() == FormFieldType::kRadioButton;
+}
+
 }  // namespace
 
 const JSPropertySpec CJS_Field::PropertySpecs[] = {
@@ -1082,10 +1087,8 @@ CJS_Return CJS_Field::get_export_values(CJS_Runtime* pRuntime) {
     return CJS_Return(JSMessage::kBadObjectError);
 
   CPDF_FormField* pFormField = FieldArray[0];
-  if (pFormField->GetFieldType() != FormFieldType::kCheckBox &&
-      pFormField->GetFieldType() != FormFieldType::kRadioButton) {
+  if (!IsCheckBoxOrRadioButton(pFormField))
     return CJS_Return(JSMessage::kObjectTypeError);
-  }
 
   v8::Local<v8::Array> ExportValuesArray = pRuntime->NewArray();
   if (m_nFormControlIndex < 0) {
@@ -1118,10 +1121,8 @@ CJS_Return CJS_Field::set_export_values(CJS_Runtime* pRuntime,
     return CJS_Return(JSMessage::kBadObjectError);
 
   CPDF_FormField* pFormField = FieldArray[0];
-  if (pFormField->GetFieldType() != FormFieldType::kCheckBox &&
-      pFormField->GetFieldType() != FormFieldType::kRadioButton) {
+  if (!IsCheckBoxOrRadioButton(pFormField))
     return CJS_Return(JSMessage::kObjectTypeError);
-  }
 
   if (!m_bCanSet)
     return CJS_Return(JSMessage::kReadOnlyError);
@@ -1872,10 +1873,8 @@ CJS_Return CJS_Field::get_style(CJS_Runtime* pRuntime) {
     return CJS_Return(JSMessage::kBadObjectError);
 
   CPDF_FormField* pFormField = FieldArray[0];
-  if (pFormField->GetFieldType() != FormFieldType::kRadioButton &&
-      pFormField->GetFieldType() != FormFieldType::kCheckBox) {
+  if (!IsCheckBoxOrRadioButton(pFormField))
     return CJS_Return(JSMessage::kObjectTypeError);
-  }
 
   CPDF_FormControl* pFormControl = GetSmartFieldControl(pFormField);
   if (!pFormControl)
@@ -2389,10 +2388,8 @@ CJS_Return CJS_Field::checkThisBox(
     return CJS_Return(JSMessage::kBadObjectError);
 
   CPDF_FormField* pFormField = FieldArray[0];
-  if (pFormField->GetFieldType() != FormFieldType::kCheckBox &&
-      pFormField->GetFieldType() != FormFieldType::kRadioButton) {
+  if (!IsCheckBoxOrRadioButton(pFormField))
     return CJS_Return(JSMessage::kObjectTypeError);
-  }
   if (nWidget < 0 || nWidget >= pFormField->CountControls())
     return CJS_Return(JSMessage::kValueError);
 
@@ -2429,9 +2426,7 @@ CJS_Return CJS_Field::defaultIsChecked(
   if (nWidget < 0 || nWidget >= pFormField->CountControls())
     return CJS_Return(JSMessage::kValueError);
 
-  return CJS_Return(pRuntime->NewBoolean(
-      pFormField->GetFieldType() == FormFieldType::kCheckBox ||
-      pFormField->GetFieldType() == FormFieldType::kRadioButton));
+  return CJS_Return(pRuntime->NewBoolean(IsCheckBoxOrRadioButton(pFormField)));
 }
 
 CJS_Return CJS_Field::deleteItemAt(
@@ -2537,10 +2532,9 @@ CJS_Return CJS_Field::isBoxChecked(
   if (nIndex < 0 || nIndex >= pFormField->CountControls())
     return CJS_Return(JSMessage::kValueError);
 
-  return CJS_Return(pRuntime->NewBoolean(
-      ((pFormField->GetFieldType() == FormFieldType::kCheckBox ||
-        pFormField->GetFieldType() == FormFieldType::kRadioButton) &&
-       pFormField->GetControl(nIndex)->IsChecked() != 0)));
+  return CJS_Return(
+      pRuntime->NewBoolean((IsCheckBoxOrRadioButton(pFormField) &&
+                            pFormField->GetControl(nIndex)->IsChecked() != 0)));
 }
 
 CJS_Return CJS_Field::isDefaultChecked(
@@ -2559,8 +2553,7 @@ CJS_Return CJS_Field::isDefaultChecked(
     return CJS_Return(JSMessage::kValueError);
 
   return CJS_Return(pRuntime->NewBoolean(
-      ((pFormField->GetFieldType() == FormFieldType::kCheckBox ||
-        pFormField->GetFieldType() == FormFieldType::kRadioButton) &&
+      (IsCheckBoxOrRadioButton(pFormField) &&
        pFormField->GetControl(nIndex)->IsDefaultChecked() != 0)));
 }
 
-- 
cgit v1.2.3