commit baeb14deed664734fb393808eae35e47752a3c7d
author Lei Zhang <thestig@chromium.org> Fri Aug 16 21:31:28 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Aug 16 21:31:28 2019 +0000
tree a698801aae82a6065bdaa024f1c7d846a7f28ecd
parent 5b3e4c0776c3118a6bc8f6b4e8d88cbe92e0493f

Make CXFA_ViewRecord private within CXFA_ViewLayoutProcessor.

It is only used within CXFA_ViewLayoutProcessor, so move it inside.

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

xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
index c6f1e00..0556cd1 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
@@ -329,11 +329,9 @@
 
 }  // namespace
 
-struct CXFA_ViewRecord {
-  RetainPtr<CXFA_ViewLayoutItem> pCurPageSet;
-  RetainPtr<CXFA_ViewLayoutItem> pCurPageArea;
-  RetainPtr<CXFA_ViewLayoutItem> pCurContentArea;
-};
+CXFA_ViewLayoutProcessor::CXFA_ViewRecord::CXFA_ViewRecord() = default;
+
+CXFA_ViewLayoutProcessor::CXFA_ViewRecord::~CXFA_ViewRecord() = default;
 
 CXFA_ViewLayoutProcessor::CXFA_ViewLayoutProcessor(
     CXFA_LayoutProcessor* pLayoutProcessor)
@@ -564,15 +562,16 @@
   return FLT_MAX;
 }
 
-CXFA_ViewRecord* CXFA_ViewLayoutProcessor::AppendNewRecord(
+CXFA_ViewLayoutProcessor::CXFA_ViewRecord*
+CXFA_ViewLayoutProcessor::AppendNewRecord(
     std::unique_ptr<CXFA_ViewRecord> pNewRecord) {
   m_ProposedViewRecords.push_back(std::move(pNewRecord));
   return m_ProposedViewRecords.back().get();
 }
 
-CXFA_ViewRecord* CXFA_ViewLayoutProcessor::CreateViewRecord(
-    CXFA_Node* pPageNode,
-    bool bCreateNew) {
+CXFA_ViewLayoutProcessor::CXFA_ViewRecord*
+CXFA_ViewLayoutProcessor::CreateViewRecord(CXFA_Node* pPageNode,
+                                           bool bCreateNew) {
   ASSERT(pPageNode);
   auto pNewRecord = pdfium::MakeUnique<CXFA_ViewRecord>();
   if (!HasCurrentViewRecord()) {
@@ -637,7 +636,8 @@
   return AppendNewRecord(std::move(pNewRecord));
 }
 
-CXFA_ViewRecord* CXFA_ViewLayoutProcessor::CreateViewRecordSimple() {
+CXFA_ViewLayoutProcessor::CXFA_ViewRecord*
+CXFA_ViewLayoutProcessor::CreateViewRecordSimple() {
   auto pNewRecord = pdfium::MakeUnique<CXFA_ViewRecord>();
   if (HasCurrentViewRecord())
     *pNewRecord = *GetCurrentViewRecord();

xfa/fxfa/layout/cxfa_viewlayoutprocessor.h

diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
index ec7778e..0f4b351 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
@@ -19,7 +19,6 @@
 
 class CXFA_LayoutItem;
 class CXFA_Node;
-struct CXFA_ViewRecord;
 
 class CXFA_ViewLayoutProcessor {
  public:
@@ -61,6 +60,15 @@
   CXFA_Node* ProcessBookendTrailer(const CXFA_Node* pBookendNode);
 
  private:
+  struct CXFA_ViewRecord {
+    CXFA_ViewRecord();
+    ~CXFA_ViewRecord();
+
+    RetainPtr<CXFA_ViewLayoutItem> pCurPageSet;
+    RetainPtr<CXFA_ViewLayoutItem> pCurPageArea;
+    RetainPtr<CXFA_ViewLayoutItem> pCurContentArea;
+  };
+
   using RecordList = std::list<std::unique_ptr<CXFA_ViewRecord>>;
 
   bool AppendNewPage(bool bFirstTemPage);