From cb798258c433bec7087948fcbfff14d1e7683006 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 17 Sep 2018 18:25:32 +0000
Subject: Fix final/protected conflicts.

Classes marked |final| should not have |protected| members. In turn,
"private field m_dwEncryptObjNum is not used" warning is produced.

Change-Id: I51a96aca5a5f499381a6764d892962f7f2dc0327
Reviewed-on: https://pdfium-review.googlesource.com/42611
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
---
 fpdfsdk/fpdfxfa/cpdfxfa_context.h         | 3 +--
 fpdfsdk/fpdfxfa/cpdfxfa_page.h            | 3 +--
 fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'fpdfsdk/fpdfxfa')

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
index 887f06d431..1315375b58 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
@@ -93,7 +93,7 @@ class CPDFXFA_Context final : public CPDF_Document::Extension,
 
   std::unique_ptr<IFWL_AdapterTimerMgr> NewTimerMgr() override;
 
- protected:
+ private:
   friend class CPDFXFA_DocEnvironment;
 
   int GetOriginalPageCount() const { return m_nPageCount; }
@@ -107,7 +107,6 @@ class CPDFXFA_Context final : public CPDF_Document::Extension,
     return &m_XFAPageList;
   }
 
- private:
   CJS_Runtime* GetCJSRuntime() const;
   void CloseXFADoc();
 
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.h b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
index 769bdaa792..90376222f4 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
@@ -52,7 +52,7 @@ class CPDFXFA_Page final : public IPDF_Page {
     m_pXFAPageView = pPageView;
   }
 
- protected:
+ private:
   // Refcounted class.
   CPDFXFA_Page(CPDFXFA_Context* pContext, int page_index);
   ~CPDFXFA_Page() override;
@@ -60,7 +60,6 @@ class CPDFXFA_Page final : public IPDF_Page {
   bool LoadPDFPage();
   bool LoadXFAPageView();
 
- private:
   RetainPtr<CPDF_Page> m_pPDFPage;
   CXFA_FFPageView* m_pXFAPageView;
   UnownedPtr<CPDFXFA_Context> const m_pContext;
diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
index 8bca0bdd28..770b0e2d97 100644
--- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
@@ -26,7 +26,7 @@ class CXFA_FWLAdapterTimerMgr final : public IFWL_AdapterTimerMgr {
              CFWL_TimerInfo** pTimerInfo) override;
   void Stop(CFWL_TimerInfo* pTimerInfo) override;
 
- protected:
+ private:
   static void TimerProc(int32_t idEvent);
 
   static std::vector<CFWL_TimerInfo*>* s_TimerArray;
-- 
cgit v1.2.3