commit 5b3e4c0776c3118a6bc8f6b4e8d88cbe92e0493f
author Lei Zhang <thestig@chromium.org> Fri Aug 16 19:54:03 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Aug 16 19:54:03 2019 +0000
tree a845f82fbf7a1e37255e0c3ebc034d1e90a9e9ac
parent 185f7a3a8104c27c49797979fa8f25bf3dff511d

Fix some nits in XFA layout code.

- Make CXFA_ViewRecord a struct.
- Rename CXFA_LayoutProcessor::IsNeedLayout() to NeedLayout().
- Mark NeedLayout() as const.

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

xfa/fxfa/layout/cxfa_layoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_layoutprocessor.cpp b/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
index b436da5..e84c262 100644
--- a/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
@@ -35,7 +35,7 @@
 }
 
 int32_t CXFA_LayoutProcessor::StartLayout(bool bForceRestart) {
-  if (!bForceRestart && !IsNeedLayout())
+  if (!bForceRestart && !NeedLayout())
     return 100;
 
   m_pContentLayoutProcessor.reset();
@@ -133,6 +133,6 @@
                                 : nullptr;
 }
 
-bool CXFA_LayoutProcessor::IsNeedLayout() {
+bool CXFA_LayoutProcessor::NeedLayout() const {
   return m_bNeedLayout || !m_rgChangedContainers.empty();
 }

xfa/fxfa/layout/cxfa_layoutprocessor.h

diff --git a/xfa/fxfa/layout/cxfa_layoutprocessor.h b/xfa/fxfa/layout/cxfa_layoutprocessor.h
index 29cd3d6..5b6730a 100644
--- a/xfa/fxfa/layout/cxfa_layoutprocessor.h
+++ b/xfa/fxfa/layout/cxfa_layoutprocessor.h
@@ -46,7 +46,7 @@
   }
 
  private:
-  bool IsNeedLayout();
+  bool NeedLayout() const;
 
   std::unique_ptr<CXFA_ViewLayoutProcessor> m_pViewLayoutProcessor;
   std::unique_ptr<CXFA_ContentLayoutProcessor> m_pContentLayoutProcessor;

xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
index 0ff1777..c6f1e00 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
@@ -329,15 +329,7 @@
 
 }  // namespace
 
-class CXFA_ViewRecord {
- public:
-  CXFA_ViewRecord(CXFA_ViewLayoutItem* pPageSet = nullptr,
-                  CXFA_ViewLayoutItem* pPageArea = nullptr,
-                  CXFA_ViewLayoutItem* pContentArea = nullptr)
-      : pCurPageSet(pPageSet),
-        pCurPageArea(pPageArea),
-        pCurContentArea(pContentArea) {}
-
+struct CXFA_ViewRecord {
   RetainPtr<CXFA_ViewLayoutItem> pCurPageSet;
   RetainPtr<CXFA_ViewLayoutItem> pCurPageArea;
   RetainPtr<CXFA_ViewLayoutItem> pCurContentArea;

xfa/fxfa/layout/cxfa_viewlayoutprocessor.h

diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
index 0e2577b..ec7778e 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
@@ -19,7 +19,7 @@
 
 class CXFA_LayoutItem;
 class CXFA_Node;
-class CXFA_ViewRecord;
+struct CXFA_ViewRecord;
 
 class CXFA_ViewLayoutProcessor {
  public: