From a105e003fd8ac96029f015f20ac8ad1dee8e6391 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 20 Mar 2017 11:51:32 -0700
Subject: Use std::vector<std::unique_ptr<CPVT_WordInfo>> as word array.

We never push nullptrs into this array, so remove some checks for
nullness, but be really careful about bounds checking.

Change-Id: I79960a4cc9a729b3d5985f297aea8c4b03ceb601
Reviewed-on: https://pdfium-review.googlesource.com/3103
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
---
 core/fpdfdoc/csection.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'core/fpdfdoc/csection.h')

diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h
index 6907b3dc45..b465d1d63d 100644
--- a/core/fpdfdoc/csection.h
+++ b/core/fpdfdoc/csection.h
@@ -27,8 +27,6 @@ class CSection final {
   ~CSection();
 
   void ResetAll();
-  void ResetLineArray();
-  void ResetWordArray();
   void ResetLinePlace();
   CPVT_WordPlace AddWord(const CPVT_WordPlace& place,
                          const CPVT_WordInfo& wordinfo);
@@ -50,7 +48,7 @@ class CSection final {
   CPVT_WordPlace SecPlace;
   CPVT_SectionInfo m_SecInfo;
   std::vector<std::unique_ptr<CLine>> m_LineArray;
-  CPVT_ArrayTemplate<CPVT_WordInfo*> m_WordArray;
+  std::vector<std::unique_ptr<CPVT_WordInfo>> m_WordArray;
 
  private:
   friend class CTypeset;
-- 
cgit v1.2.3