Cleanup CPDF_ApSettings and CJS_Parameters.

core/src/fpdfdoc/doc_formcontrol.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 "../../include/fpdfdoc/fpdf_doc.h"
 CPDF_FormControl::CPDF_FormControl(CPDF_FormField* pField,
                                    CPDF_Dictionary* pWidgetDict) {
   m_pField = pField;
@@ skipping 170 matching lines @@
   CFX_ByteString csH = m_pWidgetDict->GetString("H", "I");
   int i = 0;
   while (g_sHighlightingMode[i][0] != '\0') {
     if (csH.Equal(g_sHighlightingMode[i])) {
       return (HighlightingMode)i;
     }
     i++;
   }
   return Invert;
 }
-CPDF_ApSettings CPDF_FormControl::GetMK(FX_BOOL bCreate) {

[Tom Sepez, 2015/11/10 17:28:04]

Confirmed bCreate is always passed as FALSE.

[Lei Zhang, 2015/11/11 02:27:56]

Acknowledged.

-  if (!m_pWidgetDict) {
-    return NULL;
-  }
-  CPDF_ApSettings mk = m_pWidgetDict->GetDict(FX_BSTRC("MK"));
-  if (!mk && bCreate) {
-    mk = CPDF_Dictionary::Create();
-    if (mk == NULL) {
-      return NULL;
-    }
-    m_pWidgetDict->SetAt(FX_BSTRC("MK"), mk);
-  }
-  return mk;
+
+CPDF_ApSettings CPDF_FormControl::GetMK() {
+  return CPDF_ApSettings(m_pWidgetDict ? m_pWidgetDict->GetDict(FX_BSTRC("MK"))
+                                       : nullptr);
 }
+
 FX_BOOL CPDF_FormControl::HasMKEntry(CFX_ByteString csEntry) {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();

[Tom Sepez, 2015/11/10 17:28:04]

nit: how about just return GetMK().GetRotation(); and so forth for these?

[Lei Zhang, 2015/11/11 02:27:55]

Done.

   return mk.HasMKEntry(csEntry);
 }
 int CPDF_FormControl::GetRotation() {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();
   return mk.GetRotation();
 }
 FX_ARGB CPDF_FormControl::GetColor(int& iColorType, CFX_ByteString csEntry) {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();
   return mk.GetColor(iColorType, csEntry);
 }
 FX_FLOAT CPDF_FormControl::GetOriginalColor(int index, CFX_ByteString csEntry) {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();
   return mk.GetOriginalColor(index, csEntry);
 }
 void CPDF_FormControl::GetOriginalColor(int& iColorType,
                                         FX_FLOAT fc[4],
                                         CFX_ByteString csEntry) {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();
   mk.GetOriginalColor(iColorType, fc, csEntry);
 }
 CFX_WideString CPDF_FormControl::GetCaption(CFX_ByteString csEntry) {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();
   return mk.GetCaption(csEntry);
 }
 CPDF_Stream* CPDF_FormControl::GetIcon(CFX_ByteString csEntry) {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();
   return mk.GetIcon(csEntry);
 }
 CPDF_IconFit CPDF_FormControl::GetIconFit() {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();
   return mk.GetIconFit();
 }
 int CPDF_FormControl::GetTextPosition() {
-  CPDF_ApSettings mk = GetMK(FALSE);
+  CPDF_ApSettings mk = GetMK();
   return mk.GetTextPosition();
 }
 CPDF_Action CPDF_FormControl::GetAction() {
   if (!m_pWidgetDict) {
     return CPDF_Action();
   }
   if (m_pWidgetDict->KeyExist("A")) {
     return CPDF_Action(m_pWidgetDict->GetDict("A"));
   }
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "A");
@@ skipping 72 matching lines @@
   }
   if (m_pWidgetDict->KeyExist("Q")) {
     return m_pWidgetDict->GetInteger("Q", 0);
   }
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "Q");
   if (pObj == NULL) {
     return m_pField->m_pForm->GetFormAlignment();
   }
   return pObj->GetInteger();
 }
-FX_BOOL CPDF_ApSettings::HasMKEntry(const CFX_ByteStringC& csEntry) {
-  if (m_pDict == NULL) {
-    return FALSE;
-  }
-  return m_pDict->KeyExist(csEntry);
+
+CPDF_ApSettings::CPDF_ApSettings(CPDF_Dictionary* pDict) : m_pDict(pDict) {}
+
+FX_BOOL CPDF_ApSettings::HasMKEntry(const CFX_ByteStringC& csEntry) const {

[Tom Sepez, 2015/11/10 17:28:04]

can this be just bool?

[Lei Zhang, 2015/11/11 02:27:55]

Done.

+  return m_pDict ? m_pDict->KeyExist(csEntry) : FALSE;

[Tom Sepez, 2015/11/10 17:28:04]

nit: just return m_pDict && m_pDict->KeyExit(csEntry);

[Lei Zhang, 2015/11/11 02:27:55]

Done.

 }
-int CPDF_ApSettings::GetRotation() {
-  if (m_pDict == NULL) {
+
+int CPDF_ApSettings::GetRotation() const {
+  return m_pDict ? m_pDict->GetInteger(FX_BSTRC("R")) : 0;
+}
+
+FX_ARGB CPDF_ApSettings::GetColor(int& iColorType,
+                                  const CFX_ByteStringC& csEntry) const {
+  iColorType = COLORTYPE_TRANSPARENT;
+  if (!m_pDict)
     return 0;
-  }
-  return m_pDict->GetInteger(FX_BSTRC("R"));
-}
-FX_ARGB CPDF_ApSettings::GetColor(int& iColorType,
-                                  const CFX_ByteStringC& csEntry) {
-  iColorType = COLORTYPE_TRANSPARENT;
-  if (m_pDict == NULL) {
+
+  CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
+  if (!pEntry)
     return 0;
-  }
+
   FX_ARGB color = 0;
-  CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
-  if (pEntry == NULL) {
-    return color;
-  }
   FX_DWORD dwCount = pEntry->GetCount();
   if (dwCount == 1) {
     iColorType = COLORTYPE_GRAY;
     FX_FLOAT g = pEntry->GetNumber(0) * 255;
     color = ArgbEncode(255, (int)g, (int)g, (int)g);
   } else if (dwCount == 3) {
     iColorType = COLORTYPE_RGB;
     FX_FLOAT r = pEntry->GetNumber(0) * 255;
     FX_FLOAT g = pEntry->GetNumber(1) * 255;
     FX_FLOAT b = pEntry->GetNumber(2) * 255;
     color = ArgbEncode(255, (int)r, (int)g, (int)b);
   } else if (dwCount == 4) {
     iColorType = COLORTYPE_CMYK;
     FX_FLOAT c = pEntry->GetNumber(0);
     FX_FLOAT m = pEntry->GetNumber(1);
     FX_FLOAT y = pEntry->GetNumber(2);
     FX_FLOAT k = pEntry->GetNumber(3);
     FX_FLOAT r = 1.0f - FX_MIN(1.0f, c + k);
     FX_FLOAT g = 1.0f - FX_MIN(1.0f, m + k);
     FX_FLOAT b = 1.0f - FX_MIN(1.0f, y + k);
     color = ArgbEncode(255, (int)(r * 255), (int)(g * 255), (int)(b * 255));
   }
   return color;
 }
-FX_FLOAT CPDF_ApSettings::GetOriginalColor(int index,
-                                           const CFX_ByteStringC& csEntry) {
-  if (m_pDict == NULL) {
+
+FX_FLOAT CPDF_ApSettings::GetOriginalColor(
+    int index,
+    const CFX_ByteStringC& csEntry) const {
+  if (!m_pDict)
     return 0;
-  }
+
   CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
-  if (pEntry != NULL) {
-    return pEntry->GetNumber(index);
-  }
-  return 0;
+  return pEntry ? pEntry->GetNumber(index) : 0;
 }
+
 void CPDF_ApSettings::GetOriginalColor(int& iColorType,
                                        FX_FLOAT fc[4],
-                                       const CFX_ByteStringC& csEntry) {
+                                       const CFX_ByteStringC& csEntry) const {
   iColorType = COLORTYPE_TRANSPARENT;
   for (int i = 0; i < 4; i++) {
     fc[i] = 0;
   }
   if (m_pDict == NULL) {
     return;
   }
   CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
   if (pEntry == NULL) {
     return;
   }
   FX_DWORD dwCount = pEntry->GetCount();
   if (dwCount == 1) {
     iColorType = COLORTYPE_GRAY;
     fc[0] = pEntry->GetNumber(0);
   } else if (dwCount == 3) {
     iColorType = COLORTYPE_RGB;
     fc[0] = pEntry->GetNumber(0);
     fc[1] = pEntry->GetNumber(1);
     fc[2] = pEntry->GetNumber(2);
   } else if (dwCount == 4) {
     iColorType = COLORTYPE_CMYK;
     fc[0] = pEntry->GetNumber(0);
     fc[1] = pEntry->GetNumber(1);
     fc[2] = pEntry->GetNumber(2);
     fc[3] = pEntry->GetNumber(3);
   }
 }
-CFX_WideString CPDF_ApSettings::GetCaption(const CFX_ByteStringC& csEntry) {
-  CFX_WideString csCaption;
-  if (m_pDict == NULL) {
-    return csCaption;
-  }
-  return m_pDict->GetUnicodeText(csEntry);
+
+CFX_WideString CPDF_ApSettings::GetCaption(
+    const CFX_ByteStringC& csEntry) const {
+  return m_pDict ? m_pDict->GetUnicodeText(csEntry) : CFX_WideString();
 }
-CPDF_Stream* CPDF_ApSettings::GetIcon(const CFX_ByteStringC& csEntry) {
-  if (m_pDict == NULL) {
-    return NULL;
-  }
-  return m_pDict->GetStream(csEntry);
+
+CPDF_Stream* CPDF_ApSettings::GetIcon(const CFX_ByteStringC& csEntry) const {
+  return m_pDict ? m_pDict->GetStream(csEntry) : nullptr;
 }
-CPDF_IconFit CPDF_ApSettings::GetIconFit() {
-  if (m_pDict == NULL) {
-    return NULL;
-  }
-  return m_pDict->GetDict(FX_BSTRC("IF"));
+
+CPDF_IconFit CPDF_ApSettings::GetIconFit() const {
+  return m_pDict ? m_pDict->GetDict(FX_BSTRC("IF")) : nullptr;
 }
-int CPDF_ApSettings::GetTextPosition() {
-  if (m_pDict == NULL) {
-    return TEXTPOS_CAPTION;
-  }
-  return m_pDict->GetInteger(FX_BSTRC("TP"), TEXTPOS_CAPTION);
+
+int CPDF_ApSettings::GetTextPosition() const {
+  return m_pDict ? m_pDict->GetInteger(FX_BSTRC("TP"), TEXTPOS_CAPTION)
+                 : TEXTPOS_CAPTION;
 }