diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-17 14:17:25 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-17 21:58:51 +0000 |
| commit | 7a1220dc1c0051f2a6bf50f3f38419ae51ecb9a1 (patch) | |
| tree | 72d186d4898da33e9f582a791aaa2562f74628e4 /core/fpdfdoc/csection.h | |
| parent | f8b15f46e69fdec04a03afeb6f2bf60f90dff433 (diff) | |
| download | pdfium-7a1220dc1c0051f2a6bf50f3f38419ae51ecb9a1.tar.xz | |
Replace CLines class with std::vector<Cline>.
m_LineArray only grows via push_back of non-null pointer, so
remove some null checks.
Another little idiosyncrasy is CLines::Clear() doesn't clear the
items in CLines, only the things that were once in CLines but aren't
anymore. So don't call it.
Change-Id: Icc434be94b1b0522533c7533b8f6b2736bb864c4
Reviewed-on: https://pdfium-review.googlesource.com/3099
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfdoc/csection.h')
| -rw-r--r-- | core/fpdfdoc/csection.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h index b82409dc6f..6907b3dc45 100644 --- a/core/fpdfdoc/csection.h +++ b/core/fpdfdoc/csection.h @@ -7,7 +7,10 @@ #ifndef CORE_FPDFDOC_CSECTION_H_ #define CORE_FPDFDOC_CSECTION_H_ -#include "core/fpdfdoc/clines.h" +#include <memory> +#include <vector> + +#include "core/fpdfdoc/cline.h" #include "core/fpdfdoc/cpvt_sectioninfo.h" #include "core/fpdfdoc/ctypeset.h" #include "core/fxcrt/fx_coordinates.h" @@ -46,7 +49,7 @@ class CSection final { CPVT_WordPlace SecPlace; CPVT_SectionInfo m_SecInfo; - CLines m_LineArray; + std::vector<std::unique_ptr<CLine>> m_LineArray; CPVT_ArrayTemplate<CPVT_WordInfo*> m_WordArray; private: |