Tighten up XFA Visibility

This Cl changes the protected sections to be private where possible
in XFA.

Change-Id: Ibeb6ad00389686b666b1c3c5e136b9eefe35ec9e
Reviewed-on: https://pdfium-review.googlesource.com/3164
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

28 files changed, 37 insertions, 44 deletions

diff --git a/xfa/fxfa/app/cxfa_linkuserdata.h b/xfa/fxfa/app/cxfa_linkuserdata.h
index 5f4675962d..a3ccd92712 100644
--- a/xfa/fxfa/app/cxfa_linkuserdata.h
+++ b/xfa/fxfa/app/cxfa_linkuserdata.h
@@ -19,7 +19,7 @@ class CXFA_LinkUserData : public CFX_Retainable {
 
   const wchar_t* GetLinkURL() const { return m_wsURLContent.c_str(); }
 
- protected:
+ private:
   explicit CXFA_LinkUserData(wchar_t* pszText);
   ~CXFA_LinkUserData() override;
 
diff --git a/xfa/fxfa/app/cxfa_textparsecontext.h b/xfa/fxfa/app/cxfa_textparsecontext.h
index 5ea68e9473..514d5d7478 100644
--- a/xfa/fxfa/app/cxfa_textparsecontext.h
+++ b/xfa/fxfa/app/cxfa_textparsecontext.h
@@ -31,7 +31,7 @@ class CXFA_TextParseContext {
 
   CFX_RetainPtr<CFDE_CSSComputedStyle> m_pParentStyle;
 
- protected:
+ private:
   std::vector<const CFDE_CSSDeclaration*> decls_;
   FDE_CSSDisplay m_eDisplay;
 };
diff --git a/xfa/fxfa/app/cxfa_textuserdata.h b/xfa/fxfa/app/cxfa_textuserdata.h
index b0eff73f2e..18a20cdc2a 100644
--- a/xfa/fxfa/app/cxfa_textuserdata.h
+++ b/xfa/fxfa/app/cxfa_textuserdata.h
@@ -21,7 +21,7 @@ class CXFA_TextUserData : public CFX_Retainable {
   CFX_RetainPtr<CFDE_CSSComputedStyle> m_pStyle;
   CFX_RetainPtr<CXFA_LinkUserData> m_pLinkData;
 
- protected:
+ private:
   explicit CXFA_TextUserData(
       const CFX_RetainPtr<CFDE_CSSComputedStyle>& pStyle);
   CXFA_TextUserData(const CFX_RetainPtr<CFDE_CSSComputedStyle>& pStyle,
diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.h b/xfa/fxfa/app/xfa_ffcheckbutton.h
index ea8ff923a7..75f884144d 100644
--- a/xfa/fxfa/app/xfa_ffcheckbutton.h
+++ b/xfa/fxfa/app/xfa_ffcheckbutton.h
@@ -32,7 +32,7 @@ class CXFA_FFCheckButton : public CXFA_FFField {
 
   void SetFWLCheckState(XFA_CHECKSTATE eCheckState);
 
- protected:
+ private:
   bool CommitData() override;
   bool IsDataChanged() override;
 
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h
index 231381444b..b25d1862d4 100644
--- a/xfa/fxfa/app/xfa_ffchoicelist.h
+++ b/xfa/fxfa/app/xfa_ffchoicelist.h
@@ -29,7 +29,7 @@ class CXFA_FFListBox : public CXFA_FFField {
   void InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1);
   void DeleteItem(int32_t nIndex);
 
- protected:
+ private:
   bool CommitData() override;
   bool UpdateFWLData() override;
   bool IsDataChanged() override;
@@ -82,7 +82,7 @@ class CXFA_FFComboBox : public CXFA_FFField {
   void InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1);
   void DeleteItem(int32_t nIndex);
 
- protected:
+ private:
   // CXFA_FFField
   bool PtInActiveRect(const CFX_PointF& point) override;
   bool CommitData() override;
diff --git a/xfa/fxfa/app/xfa_ffimageedit.h b/xfa/fxfa/app/xfa_ffimageedit.h
index 73032b9815..ee91a772e0 100644
--- a/xfa/fxfa/app/xfa_ffimageedit.h
+++ b/xfa/fxfa/app/xfa_ffimageedit.h
@@ -26,7 +26,7 @@ class CXFA_FFImageEdit : public CXFA_FFField {
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
- protected:
+ private:
   void SetFWLRect() override;
   bool UpdateFWLData() override;
   bool CommitData() override;
diff --git a/xfa/fxfa/app/xfa_ffpushbutton.h b/xfa/fxfa/app/xfa_ffpushbutton.h
index 7e6e9e57d5..d2f5746fe9 100644
--- a/xfa/fxfa/app/xfa_ffpushbutton.h
+++ b/xfa/fxfa/app/xfa_ffpushbutton.h
@@ -36,7 +36,7 @@ class CXFA_FFPushButton : public CXFA_FFField {
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
- protected:
+ private:
   void LoadHighlightCaption();
   void LayoutHighlightCaption();
   void RenderHighlightCaption(CFX_Graphics* pGS, CFX_Matrix* pMatrix = nullptr);
diff --git a/xfa/fxfa/app/xfa_fftextedit.h b/xfa/fxfa/app/xfa_fftextedit.h
index 1e0562a75b..9b9324f9d2 100644
--- a/xfa/fxfa/app/xfa_fftextedit.h
+++ b/xfa/fxfa/app/xfa_fftextedit.h
@@ -36,14 +36,15 @@ class CXFA_FFTextEdit : public CXFA_FFField {
   bool CheckWord(const CFX_ByteStringC& sWord);
 
  protected:
+  uint32_t GetAlignment();
+
+  IFWL_WidgetDelegate* m_pOldDelegate;
+
+ private:
   bool CommitData() override;
   bool UpdateFWLData() override;
   bool IsDataChanged() override;
-
-  uint32_t GetAlignment();
   void ValidateNumberField(const CFX_WideString& wsText);
-
-  IFWL_WidgetDelegate* m_pOldDelegate;
 };
 
 class CXFA_FFNumericEdit : public CXFA_FFTextEdit {
@@ -56,7 +57,7 @@ class CXFA_FFNumericEdit : public CXFA_FFTextEdit {
   void UpdateWidgetProperty() override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
 
- public:
+ private:
   bool OnValidate(CFWL_Widget* pWidget, CFX_WideString& wsText);
 };
 
@@ -68,8 +69,6 @@ class CXFA_FFPasswordEdit : public CXFA_FFTextEdit {
   // CXFA_FFTextEdit
   bool LoadWidget() override;
   void UpdateWidgetProperty() override;
-
- protected:
 };
 
 enum XFA_DATETIMETYPE {
@@ -94,7 +93,7 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit {
                        int32_t iMonth,
                        int32_t iDay);
 
- protected:
+ private:
   bool PtInActiveRect(const CFX_PointF& point) override;
   bool CommitData() override;
   bool UpdateFWLData() override;
diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.h b/xfa/fxfa/app/xfa_ffwidgetacc.h
index 8cb66e2dc5..c4988fde66 100644
--- a/xfa/fxfa/app/xfa_ffwidgetacc.h
+++ b/xfa/fxfa/app/xfa_ffwidgetacc.h
@@ -44,7 +44,7 @@ class CXFA_TextProvider {
                     const CFX_WideString& wsAttr,
                     CFX_WideString& wsValue);
 
- protected:
+ private:
   CXFA_WidgetAcc* m_pWidgetAcc;
   XFA_TEXTPROVIDERTYPE m_eType;
   CXFA_Node* m_pTextNode;
diff --git a/xfa/fxfa/fm2js/xfa_expression.h b/xfa/fxfa/fm2js/xfa_expression.h
index 6b55ea5815..9177c305d2 100644
--- a/xfa/fxfa/fm2js/xfa_expression.h
+++ b/xfa/fxfa/fm2js/xfa_expression.h
@@ -33,7 +33,7 @@ class CXFA_FMExpression {
   uint32_t GetLine() { return m_line; }
   XFA_FM_EXPTYPE GetExpType() const { return m_type; }
 
- protected:
+ private:
   XFA_FM_EXPTYPE m_type;
   uint32_t m_line;
 };
diff --git a/xfa/fxfa/fm2js/xfa_lexer.h b/xfa/fxfa/fm2js/xfa_lexer.h
index aa7904cfb3..860c50f30a 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.h
+++ b/xfa/fxfa/fm2js/xfa_lexer.h
@@ -122,7 +122,7 @@ class CXFA_FMLexer {
   void Error(const wchar_t* msg, ...);
   bool HasError() const;
 
- protected:
+ private:
   CXFA_FMToken* Scan();
 
   const wchar_t* m_ptr;
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.h b/xfa/fxfa/parser/cscript_eventpseudomodel.h
index 6415287c8e..e50c5ac187 100644
--- a/xfa/fxfa/parser/cscript_eventpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_eventpseudomodel.h
@@ -63,7 +63,7 @@ class CScript_EventPseudoModel : public CXFA_Object {
   void Emit(CFXJSE_Arguments* pArguments);
   void Reset(CFXJSE_Arguments* pArguments);
 
- protected:
+ private:
   void Property(CFXJSE_Value* pValue, XFA_Event dwFlag, bool bSetting);
 };
 
diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.h b/xfa/fxfa/parser/cscript_hostpseudomodel.h
index 7d24a1d2b4..c64ad2ed7d 100644
--- a/xfa/fxfa/parser/cscript_hostpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_hostpseudomodel.h
@@ -50,12 +50,10 @@ class CScript_HostPseudoModel : public CXFA_Object {
   void PageDown(CFXJSE_Arguments* pArguments);
   void CurrentDateTime(CFXJSE_Arguments* pArguments);
 
- protected:
+ private:
   bool ValidateArgsForMsg(CFXJSE_Arguments* pArguments,
                           int32_t iArgIndex,
                           CFX_WideString& wsValue);
-
- private:
   void ThrowSetLanguageException() const;
   void ThrowSetNumPagesException() const;
   void ThrowSetPlatformException() const;
diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.h b/xfa/fxfa/parser/cscript_layoutpseudomodel.h
index e5e1131adc..a61f927299 100644
--- a/xfa/fxfa/parser/cscript_layoutpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.h
@@ -50,14 +50,12 @@ class CScript_LayoutPseudoModel : public CXFA_Object {
   void SheetCount(CFXJSE_Arguments* pArguments);
   void AbsPage(CFXJSE_Arguments* pArguments);
 
- protected:
+ private:
   std::vector<CXFA_Node*> GetObjArray(CXFA_LayoutProcessor* pDocLayout,
                                       int32_t iPageNo,
                                       const CFX_WideString& wsType,
                                       bool bOnPageArea);
   void PageImp(CFXJSE_Arguments* pArguments, bool bAbsPage);
-
- private:
   void ThrowSetReadyException() const;
 };
 
diff --git a/xfa/fxfa/parser/cxfa_dataexporter.h b/xfa/fxfa/parser/cxfa_dataexporter.h
index 2037167fba..ac441ca21d 100644
--- a/xfa/fxfa/parser/cxfa_dataexporter.h
+++ b/xfa/fxfa/parser/cxfa_dataexporter.h
@@ -25,7 +25,7 @@ class CXFA_DataExporter {
               uint32_t dwFlag,
               const char* pChecksum);
 
- protected:
+ private:
   bool Export(const CFX_RetainPtr<IFGAS_Stream>& pStream,
               CXFA_Node* pNode,
               uint32_t dwFlag,
diff --git a/xfa/fxfa/parser/cxfa_dataimporter.h b/xfa/fxfa/parser/cxfa_dataimporter.h
index bf04b05846..4e8bdda314 100644
--- a/xfa/fxfa/parser/cxfa_dataimporter.h
+++ b/xfa/fxfa/parser/cxfa_dataimporter.h
@@ -19,7 +19,7 @@ class CXFA_DataImporter {
 
   bool ImportData(const CFX_RetainPtr<IFX_SeekableReadStream>& pDataDocument);
 
- protected:
+ private:
   CXFA_Document* const m_pDocument;
 };
 
diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h
index 293515610c..3446b88382 100644
--- a/xfa/fxfa/parser/cxfa_document.h
+++ b/xfa/fxfa/parser/cxfa_document.h
@@ -109,7 +109,7 @@ class CXFA_Document {
   std::map<uint32_t, CXFA_Node*> m_rgGlobalBinding;
   std::vector<CXFA_Node*> m_pPendingPageSet;
 
- protected:
+ private:
   CXFA_DocumentParser* m_pParser;
   CXFA_Node* m_pRootNode;
   std::unique_ptr<CXFA_ScriptContext> m_pScriptContext;
diff --git a/xfa/fxfa/parser/cxfa_document_parser.h b/xfa/fxfa/parser/cxfa_document_parser.h
index 617bddf55b..9a219f74c1 100644
--- a/xfa/fxfa/parser/cxfa_document_parser.h
+++ b/xfa/fxfa/parser/cxfa_document_parser.h
@@ -31,7 +31,7 @@ class CXFA_DocumentParser {
   CXFA_FFNotify* GetNotify() const;
   CXFA_Document* GetDocument() const;
 
- protected:
+ private:
   CXFA_SimpleParser m_nodeParser;
   CXFA_FFNotify* m_pNotify;
   std::unique_ptr<CXFA_Document> m_pDocument;
diff --git a/xfa/fxfa/parser/cxfa_image.h b/xfa/fxfa/parser/cxfa_image.h
index bf69897693..204441ab6b 100644
--- a/xfa/fxfa/parser/cxfa_image.h
+++ b/xfa/fxfa/parser/cxfa_image.h
@@ -26,7 +26,7 @@ class CXFA_Image : public CXFA_Data {
   bool SetHref(const CFX_WideString& wsHref);
   bool SetTransferEncoding(int32_t iTransferEncoding);
 
- protected:
+ private:
   bool m_bDefValue;
 };
 
diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.h b/xfa/fxfa/parser/cxfa_layoutpagemgr.h
index be90b4674f..ae967b55c0 100644
--- a/xfa/fxfa/parser/cxfa_layoutpagemgr.h
+++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.h
@@ -51,7 +51,7 @@ class CXFA_LayoutPageMgr {
                                      bool bLeader,
                                      CXFA_Node*& pBookendAppendNode);
 
- protected:
+ private:
   bool AppendNewPage(bool bFirstTemPage = false);
   void ReorderPendingLayoutRecordToTail(CXFA_ContainerRecord* pNewRecord,
                                         CXFA_ContainerRecord* pPrevRecord);
diff --git a/xfa/fxfa/parser/cxfa_nodehelper.h b/xfa/fxfa/parser/cxfa_nodehelper.h
index 7da6c5dece..d26ccf64e9 100644
--- a/xfa/fxfa/parser/cxfa_nodehelper.h
+++ b/xfa/fxfa/parser/cxfa_nodehelper.h
@@ -62,7 +62,6 @@ class CXFA_NodeHelper {
   void SetCreateNodeType(CXFA_Node* refNode);
   bool NodeIsProperty(CXFA_Node* refNode);
 
- public:
   XFA_Element m_eLastCreateType;
   CXFA_Node* m_pCreateParent;
   int32_t m_iCreateCount;
diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validate.h
index 03bbaddf7b..470cefe773 100644
--- a/xfa/fxfa/parser/cxfa_validate.h
+++ b/xfa/fxfa/parser/cxfa_validate.h
@@ -31,7 +31,7 @@ class CXFA_Validate : public CXFA_Data {
   void GetPicture(CFX_WideString& wsPicture);
   CXFA_Script GetScript();
 
- protected:
+ private:
   void GetMessageText(CFX_WideString& wsMessage,
                       const CFX_WideString& wsMessageType);
   void SetMessageText(CFX_WideString& wsMessage,
diff --git a/xfa/fxfa/parser/cxfa_widetextread.h b/xfa/fxfa/parser/cxfa_widetextread.h
index 6c4a97f358..3850660fbd 100644
--- a/xfa/fxfa/parser/cxfa_widetextread.h
+++ b/xfa/fxfa/parser/cxfa_widetextread.h
@@ -36,7 +36,7 @@ class CXFA_WideTextRead : public IFGAS_Stream {
 
   CFX_WideString GetSrcText() const;
 
- protected:
+ private:
   explicit CXFA_WideTextRead(const CFX_WideString& wsBuffer);
   ~CXFA_WideTextRead() override;
 
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index a04726e105..3e74018432 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -162,7 +162,7 @@ class CXFA_WidgetData : public CXFA_Data {
   bool m_bIsNull;
   bool m_bPreNull;
 
- protected:
+ private:
   void SyncValue(const CFX_WideString& wsValue, bool bNotify);
   void InsertListTextItem(CXFA_Node* pItems,
                           const CFX_WideString& wsText,
diff --git a/xfa/fxfa/parser/xfa_locale.h b/xfa/fxfa/parser/xfa_locale.h
index 5326f513c1..ae3e4bd170 100644
--- a/xfa/fxfa/parser/xfa_locale.h
+++ b/xfa/fxfa/parser/xfa_locale.h
@@ -41,7 +41,7 @@ class CXFA_XMLLocale : public IFX_Locale {
   void GetNumPattern(FX_LOCALENUMSUBCATEGORY eType,
                      CFX_WideString& wsPattern) const override;
 
- protected:
+ private:
   void GetPattern(CXML_Element* pElement,
                   const CFX_ByteStringC& bsTag,
                   const CFX_WideStringC& wsName,
@@ -50,7 +50,6 @@ class CXFA_XMLLocale : public IFX_Locale {
                                    int index,
                                    bool bAbbr) const;
 
- private:
   std::unique_ptr<CXML_Element> m_pLocaleData;
 };
 
@@ -83,7 +82,7 @@ class CXFA_NodeLocale : public IFX_Locale {
   void GetNumPattern(FX_LOCALENUMSUBCATEGORY eType,
                      CFX_WideString& wsPattern) const override;
 
- protected:
+ private:
   CXFA_Node* GetNodeByName(CXFA_Node* pParent,
                            const CFX_WideStringC& wsName) const;
   CFX_WideString GetSymbol(XFA_Element eElement,
diff --git a/xfa/fxfa/parser/xfa_localevalue.h b/xfa/fxfa/parser/xfa_localevalue.h
index cea5eb1dc5..dfe758d4a9 100644
--- a/xfa/fxfa/parser/xfa_localevalue.h
+++ b/xfa/fxfa/parser/xfa_localevalue.h
@@ -99,7 +99,7 @@ class CXFA_LocaleValue {
   bool IsEmpty() const { return m_wsValue.IsEmpty(); }
   bool IsValid() const { return m_bValid; }
 
- protected:
+ private:
   bool ParsePatternValue(const CFX_WideString& wsValue,
                          const CFX_WideString& wsPattern,
                          IFX_Locale* pLocale);
diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h
index 91b88631ed..3e98a4747c 100644
--- a/xfa/fxfa/parser/xfa_object.h
+++ b/xfa/fxfa/parser/xfa_object.h
@@ -615,7 +615,7 @@ class CXFA_Node : public CXFA_Object {
                                bool bSetting,
                                XFA_ATTRIBUTE eAttribute);
 
- protected:
+ private:
   friend class CXFA_Document;
 
   CXFA_Node(CXFA_Document* pDoc,
@@ -737,7 +737,7 @@ class CXFA_ArrayNodeList : public CXFA_NodeList {
 
   void SetArrayNodeList(const std::vector<CXFA_Node*>& srcArray);
 
- protected:
+ private:
   std::vector<CXFA_Node*> m_array;
 };
 
@@ -752,7 +752,7 @@ class CXFA_AttachNodeList : public CXFA_NodeList {
   bool Remove(CXFA_Node* pNode) override;
   CXFA_Node* Item(int32_t iIndex) override;
 
- protected:
+ private:
   CXFA_Node* m_pAttachNode;
 };
 class CXFA_TraverseStrategy_XFAContainerNode {
diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h
index c40fdf1b18..c3111795da 100644
--- a/xfa/fxfa/parser/xfa_utils.h
+++ b/xfa/fxfa/parser/xfa_utils.h
@@ -91,7 +91,7 @@ class CXFA_NodeIteratorTemplate {
     return m_pCurrent;
   }
 
- protected:
+ private:
   bool RootReachableFromNode(NodeType* pNode) {
     if (!pNode)
       return false;