Merge to XFA: Kill CFX_ByteArray in master.

core/include/fpdfdoc/fpdf_doc.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 
 #include <map>
@@ skipping 716 matching lines @@
     Text,
     RichText,
     File,
     ListBox,
     ComboBox,
     Sign
   };
 
   CFX_WideString GetFullName();
 
-  Type GetType() { return m_Type; }
-
-  FX_DWORD GetFlags() { return m_Flags; }
+  Type GetType() const { return m_Type; }
+  FX_DWORD GetFlags() const { return m_Flags; }
 
   CPDF_Dictionary* GetFieldDict() const { return m_pDict; }
-
   void SetFieldDict(CPDF_Dictionary* pDict) { m_pDict = pDict; }
 
   FX_BOOL ResetField(FX_BOOL bNotify = FALSE);
 
   int CountControls() { return m_ControlList.GetSize(); }
 
   CPDF_FormControl* GetControl(int index) { return m_ControlList.GetAt(index); }
 
   int GetControlIndex(const CPDF_FormControl* pControl);
 
@@ skipping 39 matching lines @@
 
   CFX_WideString GetOptionLabel(int index);
 
   CFX_WideString GetOptionValue(int index);
 
   int FindOption(CFX_WideString csOptLabel);
 
   int FindOptionValue(const CFX_WideString& csOptValue, int iStartIndex = 0);
 
   FX_BOOL CheckControl(int iControlIndex,
-                       FX_BOOL bChecked,
-                       FX_BOOL bNotify = FALSE);
+                       bool bChecked,
+                       bool bNotify = false);
 
   int GetTopVisibleIndex();
 
   int CountSelectedOptions();
 
   int GetSelectedOptionIndex(int index);
 
   FX_BOOL IsOptionSelected(int iOptIndex);
 
   FX_BOOL SelectOption(int iOptIndex,
@@ skipping 74 matching lines @@
   CPDF_Dictionary* m_pDict;
 };
 
 #define TEXTPOS_CAPTION 0
 #define TEXTPOS_ICON 1
 #define TEXTPOS_BELOW 2
 #define TEXTPOS_ABOVE 3
 #define TEXTPOS_RIGHT 4
 #define TEXTPOS_LEFT 5
 #define TEXTPOS_OVERLAID 6
+
 class CPDF_FormControl {
  public:
-  CPDF_FormField::Type GetType() { return m_pField->GetType(); }
+  enum HighlightingMode { None = 0, Invert, Outline, Push, Toggle };
 
+  CPDF_FormField::Type GetType() const { return m_pField->GetType(); }
   CPDF_InterForm* GetInterForm() const { return m_pForm; }
-
   CPDF_FormField* GetField() const { return m_pField; }
-
   CPDF_Dictionary* GetWidget() const { return m_pWidgetDict; }
-
   CFX_FloatRect GetRect() const;
 
   void DrawControl(CFX_RenderDevice* pDevice,
                    CFX_Matrix* pMatrix,
                    CPDF_Page* pPage,
                    CPDF_Annot::AppearanceMode mode,
                    const CPDF_RenderOptions* pOptions = NULL);
 
   CFX_ByteString GetCheckedAPState();
-
   CFX_WideString GetExportValue();
 
-  FX_BOOL IsChecked();
-
-  FX_BOOL IsDefaultChecked();
-
-  enum HighlightingMode { None = 0, Invert, Outline, Push, Toggle };
+  bool IsChecked() const;
+  bool IsDefaultChecked() const;
 
   HighlightingMode GetHighlightingMode();
-
   bool HasMKEntry(CFX_ByteString csEntry) const;
-
   int GetRotation();
 
   inline FX_ARGB GetBorderColor(int& iColorType) {
     return GetColor(iColorType, "BC");
   }
 
   FX_FLOAT GetOriginalBorderColor(int index) {
     return GetOriginalColor(index, "BC");
   }
 
@@ skipping 35 matching lines @@
 
   CPDF_DefaultAppearance GetDefaultAppearance();
 
   CPDF_Font* GetDefaultControlFont();
 
   int GetControlAlignment();
 
  protected:
   CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict);
 
-  CFX_ByteString GetOnStateName();
-
+  CFX_ByteString GetOnStateName() const;
   void SetOnStateName(const CFX_ByteString& csOn);
 
   void CheckControl(FX_BOOL bChecked);
 
   FX_ARGB GetColor(int& iColorType, CFX_ByteString csEntry);
 
   FX_FLOAT GetOriginalColor(int index, CFX_ByteString csEntry);
 
   void GetOriginalColor(int& iColorType,
                         FX_FLOAT fc[4],
                         CFX_ByteString csEntry);
 
   CFX_WideString GetCaption(CFX_ByteString csEntry);
 
   CPDF_Stream* GetIcon(CFX_ByteString csEntry);
 
   CPDF_ApSettings GetMK() const;
 
   CPDF_InterForm* m_pForm;
 
   CPDF_FormField* m_pField;
 
   CPDF_Dictionary* m_pWidgetDict;
   friend class CPDF_InterForm;
   friend class CPDF_FormField;
 };
+
 class CPDF_FormNotify {
  public:
   virtual ~CPDF_FormNotify() {}
 
   virtual int BeforeValueChange(const CPDF_FormField* pField,
                                 CFX_WideString& csValue) {
     return 0;
   }
-
   virtual int AfterValueChange(const CPDF_FormField* pField) { return 0; }
 
   virtual int BeforeSelectionChange(const CPDF_FormField* pField,
                                     CFX_WideString& csValue) {
     return 0;
   }
-
   virtual int AfterSelectionChange(const CPDF_FormField* pField) { return 0; }
 
-  virtual int AfterCheckedStatusChange(const CPDF_FormField* pField,
-                                       const CFX_ByteArray& statusArray) {
-    return 0;
-  }
-
+  virtual void AfterCheckedStatusChange(CPDF_FormField* pField) {}
   virtual int BeforeFormReset(const CPDF_InterForm* pForm) { return 0; }
-
   virtual int AfterFormReset(const CPDF_InterForm* pForm) { return 0; }
-
   virtual int BeforeFormImportData(const CPDF_InterForm* pForm) { return 0; }
-
   virtual int AfterFormImportData(const CPDF_InterForm* pForm) { return 0; }
 };
+
 FX_BOOL FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
 class CPDF_PageLabel {
  public:
   explicit CPDF_PageLabel(CPDF_Document* pDocument) { m_pDocument = pDocument; }
 
   CFX_WideString GetLabel(int nPage) const;
 
   int32_t GetPageByLabel(const CFX_ByteStringC& bsLabel) const;
 
   int32_t GetPageByLabel(const CFX_WideStringC& wsLabel) const;
@@ skipping 94 matching lines @@
   CFX_WideString GetCaption(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Dictionary* const m_pDict;
 };
 
 CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_