diff options
Diffstat (limited to 'chromium/third_party/pdfium/core/fpdfdoc/csection.h')
-rw-r--r-- | chromium/third_party/pdfium/core/fpdfdoc/csection.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chromium/third_party/pdfium/core/fpdfdoc/csection.h b/chromium/third_party/pdfium/core/fpdfdoc/csection.h index a2ac43b102d..b465d1d63df 100644 --- a/chromium/third_party/pdfium/core/fpdfdoc/csection.h +++ b/chromium/third_party/pdfium/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" @@ -24,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); @@ -33,22 +34,21 @@ class CSection final { void ClearWords(const CPVT_WordRange& PlaceRange); void ClearWord(const CPVT_WordPlace& place); CPVT_FloatRect Rearrange(); - CFX_SizeF GetSectionSize(FX_FLOAT fFontSize); + CFX_SizeF GetSectionSize(float fFontSize); CPVT_WordPlace GetBeginWordPlace() const; CPVT_WordPlace GetEndWordPlace() const; CPVT_WordPlace GetPrevWordPlace(const CPVT_WordPlace& place) const; CPVT_WordPlace GetNextWordPlace(const CPVT_WordPlace& place) const; void UpdateWordPlace(CPVT_WordPlace& place) const; CPVT_WordPlace SearchWordPlace(const CFX_PointF& point) const; - CPVT_WordPlace SearchWordPlace(FX_FLOAT fx, + CPVT_WordPlace SearchWordPlace(float fx, const CPVT_WordPlace& lineplace) const; - CPVT_WordPlace SearchWordPlace(FX_FLOAT fx, - const CPVT_WordRange& range) const; + CPVT_WordPlace SearchWordPlace(float fx, const CPVT_WordRange& range) const; CPVT_WordPlace SecPlace; CPVT_SectionInfo m_SecInfo; - CLines m_LineArray; - CPVT_ArrayTemplate<CPVT_WordInfo*> m_WordArray; + std::vector<std::unique_ptr<CLine>> m_LineArray; + std::vector<std::unique_ptr<CPVT_WordInfo>> m_WordArray; private: friend class CTypeset; |