diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-05-04 07:52:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-04 07:52:55 -0700 |
| commit | 696fc8b70c19cf35fd10bc10f547aae74fc6333c (patch) | |
| tree | 95b73fc964d2d90c4e2a3770b8c818f5b190dda9 /core/fpdfdoc/csection.h | |
| parent | 2a14bde1011a5d374d1109fd83f59a8ff67c162e (diff) | |
| download | pdfium-696fc8b70c19cf35fd10bc10f547aae74fc6333c.tar.xz | |
Revert of Remove unneeded CPVT classes. (patchset #7 id:140001 of https://codereview.chromium.org/1919283008/ )chromium/2729chromium/2728chromium/2727chromium/2726chromium/2725
Reason for revert:
Causing segv on certain PDFs which make the PDF load tests hang. crbug.com/608901
Original issue's description:
> Remove unneeded CPVT classes.
>
> - CPVT_Size is the same as CFX_PointF
> - CPVT_FloatRange is unused.
> - CPVT_ArrayTemplate is just a wrapper for CFX_ArrayTemplate.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/a354eb517429e10d84abff65e455f0c183fe58e0
TBR=thestig@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
Review-Url: https://codereview.chromium.org/1947093002
Diffstat (limited to 'core/fpdfdoc/csection.h')
| -rw-r--r-- | core/fpdfdoc/csection.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h index f6a9f3baa2..d8974cb020 100644 --- a/core/fpdfdoc/csection.h +++ b/core/fpdfdoc/csection.h @@ -21,8 +21,7 @@ struct CPVT_WordPlace; class CSection { public: explicit CSection(CPDF_VariableText* pVT); - ~CSection(); - + virtual ~CSection(); void ResetAll(); void ResetLineArray(); void ResetWordArray(); @@ -33,7 +32,7 @@ class CSection { void ClearWords(const CPVT_WordRange& PlaceRange); void ClearWord(const CPVT_WordPlace& place); CPVT_FloatRect Rearrange(); - CFX_PointF GetSectionSize(FX_FLOAT fFontSize); + CPVT_Size GetSectionSize(FX_FLOAT fFontSize); CPVT_WordPlace GetBeginWordPlace() const; CPVT_WordPlace GetEndWordPlace() const; CPVT_WordPlace GetPrevWordPlace(const CPVT_WordPlace& place) const; @@ -48,7 +47,7 @@ class CSection { CPVT_WordPlace SecPlace; CPVT_SectionInfo m_SecInfo; CLines m_LineArray; - CFX_ArrayTemplate<CPVT_WordInfo*> m_WordArray; + CPVT_ArrayTemplate<CPVT_WordInfo*> m_WordArray; private: friend class CTypeset; |