commit 78b7e031c5febc46b6029597a7f05ad31f5939ce
author Lei Zhang <thestig@chromium.org> Wed Mar 11 17:46:53 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Mar 11 17:46:53 2020 +0000
tree 0bebdafb6e9dc2ebe7f6e59619f4cfc7dda0b859
parent 1f61118b7f9d7d7e011d96904f8be1c6363d13a6

Make more members const in cxfa_ffpageview.h.

Make CXFA_Document::GetCurVersionMode() const as well.

Change-Id: I33cdf922768ca69c490d6531d1b62473bb25745e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/66814
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

xfa/fxfa/cxfa_ffpageview.cpp

diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp
index a4e85fb..5600ebb 100644
--- a/xfa/fxfa/cxfa_ffpageview.cpp
+++ b/xfa/fxfa/cxfa_ffpageview.cpp
@@ -105,6 +105,14 @@
   }
 }
 
+CXFA_Document* GetDocForPageView(const CXFA_FFPageView* view) {
+  return view->GetDocView()->GetDoc()->GetXFADoc();
+}
+
+bool IsDocVersionBelow205(const CXFA_Document* doc) {
+  return doc->GetCurVersionMode() < XFA_VERSION_205;
+}
+
 }  // namespace
 
 CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea)
@@ -148,11 +156,8 @@
                                                      uint32_t dwFilter)
     : m_pPageView(pPageView),
       m_dwFilter(dwFilter),
-      m_sIterator(pPageView->GetLayoutItem()) {
-  m_bIgnoreRelevant =
-      m_pPageView->GetDocView()->GetDoc()->GetXFADoc()->GetCurVersionMode() <
-      XFA_VERSION_205;
-}
+      m_bIgnoreRelevant(IsDocVersionBelow205(GetDocForPageView(pPageView))),
+      m_sIterator(pPageView->GetLayoutItem()) {}
 
 CXFA_FFPageWidgetIterator::~CXFA_FFPageWidgetIterator() {}
 
@@ -235,10 +240,9 @@
 CXFA_FFTabOrderPageWidgetIterator::CXFA_FFTabOrderPageWidgetIterator(
     CXFA_FFPageView* pPageView,
     uint32_t dwFilter)
-    : m_pPageView(pPageView), m_dwFilter(dwFilter), m_iCurWidget(-1) {
-  m_bIgnoreRelevant =
-      m_pPageView->GetDocView()->GetDoc()->GetXFADoc()->GetCurVersionMode() <
-      XFA_VERSION_205;
+    : m_pPageView(pPageView),
+      m_dwFilter(dwFilter),
+      m_bIgnoreRelevant(IsDocVersionBelow205(GetDocForPageView(pPageView))) {
   Reset();
 }
 

xfa/fxfa/cxfa_ffpageview.h

diff --git a/xfa/fxfa/cxfa_ffpageview.h b/xfa/fxfa/cxfa_ffpageview.h
index 65c0b95..99f820e 100644
--- a/xfa/fxfa/cxfa_ffpageview.h
+++ b/xfa/fxfa/cxfa_ffpageview.h
@@ -58,10 +58,10 @@
  private:
   CXFA_FFWidget* GetWidget(CXFA_LayoutItem* pLayoutItem);
 
-  UnownedPtr<CXFA_FFPageView> m_pPageView;
+  UnownedPtr<CXFA_FFPageView> const m_pPageView;
   UnownedPtr<CXFA_FFWidget> m_hCurWidget;
-  uint32_t m_dwFilter;
-  bool m_bIgnoreRelevant;
+  const uint32_t m_dwFilter;
+  const bool m_bIgnoreRelevant;
   CXFA_LayoutItemIterator m_sIterator;
 };
 
@@ -109,10 +109,10 @@
                       bool bMasterPage);
 
   std::vector<UnownedPtr<CXFA_FFWidget>> m_TabOrderWidgetArray;
-  UnownedPtr<CXFA_FFPageView> m_pPageView;
-  uint32_t m_dwFilter;
-  int32_t m_iCurWidget;
-  bool m_bIgnoreRelevant;
+  UnownedPtr<CXFA_FFPageView> const m_pPageView;
+  const uint32_t m_dwFilter;
+  int32_t m_iCurWidget = -1;
+  const bool m_bIgnoreRelevant;
 };
 
 #endif  // XFA_FXFA_CXFA_FFPAGEVIEW_H_

xfa/fxfa/parser/cxfa_document.h

diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h
index ea80475..8509d19 100644
--- a/xfa/fxfa/parser/cxfa_document.h
+++ b/xfa/fxfa/parser/cxfa_document.h
@@ -97,7 +97,7 @@
   void set_is_scripting() { m_bScripting = true; }
 
   bool IsInteractive();
-  XFA_VERSION GetCurVersionMode() { return m_eCurVersionMode; }
+  XFA_VERSION GetCurVersionMode() const { return m_eCurVersionMode; }
   XFA_VERSION RecognizeXFAVersionNumber(const WideString& wsTemplateNS);
   FormType GetFormType() const;