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/ctypeset.h | |
| parent | 2a14bde1011a5d374d1109fd83f59a8ff67c162e (diff) | |
| download | pdfium-chromium/2725.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/ctypeset.h')
| -rw-r--r-- | core/fpdfdoc/ctypeset.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/fpdfdoc/ctypeset.h b/core/fpdfdoc/ctypeset.h index 1401050b42..25bb31a801 100644 --- a/core/fpdfdoc/ctypeset.h +++ b/core/fpdfdoc/ctypeset.h @@ -16,17 +16,14 @@ class CSection; class CTypeset { public: explicit CTypeset(CSection* pSection); - ~CTypeset(); - - CFX_PointF GetEditSize(FX_FLOAT fFontSize); + virtual ~CTypeset(); + CPVT_Size GetEditSize(FX_FLOAT fFontSize); CPVT_FloatRect Typeset(); CPVT_FloatRect CharArray(); private: void SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize); void OutputLines(); - FX_FLOAT GetXPosForAlignment(FX_FLOAT fTypesetWidth, - FX_FLOAT fLineWidth) const; CPVT_FloatRect m_rcRet; CPDF_VariableText* m_pVT; |