diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-02-06 15:10:48 -0800 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-07 14:06:00 +0000 |
| commit | 76da8841aef9a60c1c65c646a9f943c25861bc33 (patch) | |
| tree | c81d3bfb4bcbe242689812b144c7b320c71cf91b /xfa/fde | |
| parent | 10def51edb8758632be9b24476459b0ab6f23c51 (diff) | |
| download | pdfium-76da8841aef9a60c1c65c646a9f943c25861bc33.tar.xz | |
Split CFX_STemplate from CFX_PSTemplate
This will allow the compiler to distinguish between rectangle
initialization from a point and a size vs. two points.
Add corresponding ctors, and fix style noise induced in XFA,
now that rects have become a complex type.
Change-Id: Iaa5887db63dafd41ac95f5c623989ca1d6443fd6
Reviewed-on: https://pdfium-review.googlesource.com/2533
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde')
| -rw-r--r-- | xfa/fde/fde_visualset.h | 5 | ||||
| -rw-r--r-- | xfa/fde/tto/fde_textout.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h index 30703e795a..0c6341fead 100644 --- a/xfa/fde/fde_visualset.h +++ b/xfa/fde/fde_visualset.h @@ -25,12 +25,17 @@ enum FDE_VISUALOBJTYPE { }; struct FDE_TEXTEDITPIECE { + FDE_TEXTEDITPIECE(); + ~FDE_TEXTEDITPIECE(); + int32_t nStart; int32_t nCount; int32_t nBidiLevel; CFX_RectF rtPiece; uint32_t dwCharStyles; }; +inline FDE_TEXTEDITPIECE::FDE_TEXTEDITPIECE() = default; +inline FDE_TEXTEDITPIECE::~FDE_TEXTEDITPIECE() = default; class IFDE_VisualSet { public: diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index e1eb71cf3b..97ec1251f4 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -47,11 +47,16 @@ class CFX_TxtBreak; struct FX_TXTRUN; struct FDE_TTOPIECE { + FDE_TTOPIECE(); + ~FDE_TTOPIECE(); + int32_t iStartChar; int32_t iChars; uint32_t dwCharStyles; CFX_RectF rtPiece; }; +inline FDE_TTOPIECE::FDE_TTOPIECE() = default; +inline FDE_TTOPIECE::~FDE_TTOPIECE() = default; typedef CFX_MassArrayTemplate<FDE_TTOPIECE> CFDE_TTOPieceArray; class CFDE_TTOLine { |