diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /xfa/src/fdp/src/tto/fde_textout.h | |
parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
download | pdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz |
Merge to XFA: Use stdint.h types throughout PDFium.
Near-automatic merge, plus re-running scripts to update
additional usage.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1172793002
Diffstat (limited to 'xfa/src/fdp/src/tto/fde_textout.h')
-rw-r--r-- | xfa/src/fdp/src/tto/fde_textout.h | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h index 116ad89d5d..38bc8ebcec 100644 --- a/xfa/src/fdp/src/tto/fde_textout.h +++ b/xfa/src/fdp/src/tto/fde_textout.h @@ -8,8 +8,8 @@ #define _FDE_TEXTOUT_IMP
struct FDE_TTOPIECE {
public:
- FX_INT32 iStartChar;
- FX_INT32 iChars;
+ int32_t iStartChar;
+ int32_t iChars;
FX_DWORD dwCharStyles;
CFX_RectF rtPiece;
};
@@ -21,15 +21,15 @@ public: CFDE_TTOLine();
CFDE_TTOLine(const CFDE_TTOLine &ttoLine);
~CFDE_TTOLine();
- FX_INT32 AddPiece(FX_INT32 index, const FDE_TTOPIECE &ttoPiece);
- FX_INT32 GetSize() const;
- FDE_LPTTOPIECE GetPtrAt(FX_INT32 index);
- void RemoveLast(FX_INT32 iCount);
+ int32_t AddPiece(int32_t index, const FDE_TTOPIECE &ttoPiece);
+ int32_t GetSize() const;
+ FDE_LPTTOPIECE GetPtrAt(int32_t index);
+ void RemoveLast(int32_t iCount);
void RemoveAll(FX_BOOL bLeaveMemory);
FX_BOOL m_bNewReload;
CFDE_TTOPieceArray m_pieces;
protected:
- FX_INT32 m_iPieceCount;
+ int32_t m_iPieceCount;
};
typedef CFX_ObjectMassArrayTemplate<CFDE_TTOLine> CFDE_TTOLineArray;
class CFDE_TextOut : public IFDE_TextOut, public CFX_Target
@@ -48,7 +48,7 @@ public: virtual void SetTabWidth(FX_FLOAT fTabWidth);
virtual void SetEllipsisString(const CFX_WideString &wsEllipsis);
virtual void SetParagraphBreakChar(FX_WCHAR wch);
- virtual void SetAlignment(FX_INT32 iAlignment);
+ virtual void SetAlignment(int32_t iAlignment);
virtual void SetLineSpace(FX_FLOAT fLineSpace);
virtual void SetDIBitmap(CFX_DIBitmap *pDIB);
virtual void SetRenderDevice(CFX_RenderDevice *pDevice);
@@ -56,41 +56,41 @@ public: virtual void SetClipRect(const CFX_RectF &rtClip);
virtual void SetMatrix(const CFX_Matrix &matrix);
virtual void SetLineBreakTolerance(FX_FLOAT fTolerance);
- virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_Size &size);
- virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_SizeF &size);
- virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_Rect &rect);
- virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_RectF &rect);
+ virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Size &size);
+ virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size);
+ virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Rect &rect);
+ virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect);
- virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_INT32 x, FX_INT32 y);
- virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_FLOAT x, FX_FLOAT y);
- virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_Rect &rect);
- virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_RectF &rect);
+ virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, int32_t x, int32_t y);
+ virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y);
+ virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_Rect &rect);
+ virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect);
virtual void SetLogicClipRect(const CFX_RectF &rtClip);
- virtual void CalcLogicSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_SizeF &size);
- virtual void CalcLogicSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_RectF &rect);
- virtual void DrawLogicText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_FLOAT x, FX_FLOAT y);
- virtual void DrawLogicText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_RectF &rect);
- virtual FX_INT32 GetTotalLines();
+ virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size);
+ virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect);
+ virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y);
+ virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect);
+ virtual int32_t GetTotalLines();
protected:
- void CalcTextSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_RectF &rect);
+ void CalcTextSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect);
FX_BOOL RetrieveLineWidth(FX_DWORD dwBreakStatus, FX_FLOAT &fStartPos, FX_FLOAT &fWidth, FX_FLOAT &fHeight);
void SetLineWidth(CFX_RectF &rect);
- void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_RectF &rect, const CFX_RectF &rtClip);
- void LoadText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_RectF &rect);
+ void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect, const CFX_RectF &rtClip);
+ void LoadText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect);
void LoadEllipsis();
- void ExpandBuffer(FX_INT32 iSize, FX_INT32 iType);
- void RetrieveEllPieces(FX_INT32 *&pCharWidths);
+ void ExpandBuffer(int32_t iSize, int32_t iType);
+ void RetrieveEllPieces(int32_t *&pCharWidths);
void Reload(const CFX_RectF &rect);
void ReloadLinePiece(CFDE_TTOLine *pLine, const CFX_RectF &rect);
- FX_BOOL RetriecePieces(FX_DWORD dwBreakStatus, FX_INT32 &iStartChar, FX_INT32 &iPieceWidths, FX_BOOL bReload, const CFX_RectF &rect);
+ FX_BOOL RetriecePieces(FX_DWORD dwBreakStatus, int32_t &iStartChar, int32_t &iPieceWidths, FX_BOOL bReload, const CFX_RectF &rect);
void AppendPiece(const FDE_TTOPIECE &ttoPiece, FX_BOOL bNeedReload, FX_BOOL bEnd);
void ReplaceWidthEllipsis();
void DoAlignment(const CFX_RectF &rect);
void OnDraw(const CFX_RectF &rtClip);
- FX_INT32 GetDisplayPos(FDE_LPTTOPIECE pPiece);
- FX_INT32 GetCharRects(FDE_LPTTOPIECE pPiece);
+ int32_t GetDisplayPos(FDE_LPTTOPIECE pPiece);
+ int32_t GetCharRects(FDE_LPTTOPIECE pPiece);
void ToTextRun(const FDE_LPTTOPIECE pPiece, FX_TXTRUN &tr);
void DrawLine(const FDE_LPTTOPIECE pPiece, IFDE_Pen *&pPen);
@@ -102,29 +102,29 @@ protected: FX_FLOAT m_fLinePos;
FX_FLOAT m_fTolerance;
- FX_INT32 m_iAlignment;
- FX_INT32 m_iTxtBkAlignment;
- FX_INT32 *m_pCharWidths;
- FX_INT32 m_iChars;
- FX_INT32 *m_pEllCharWidths;
- FX_INT32 m_iEllChars;
+ int32_t m_iAlignment;
+ int32_t m_iTxtBkAlignment;
+ int32_t *m_pCharWidths;
+ int32_t m_iChars;
+ int32_t *m_pEllCharWidths;
+ int32_t m_iEllChars;
FX_WCHAR m_wParagraphBkChar;
FX_ARGB m_TxtColor;
FX_DWORD m_dwStyles;
FX_DWORD m_dwTxtBkStyles;
CFX_WideString m_wsEllipsis;
FX_BOOL m_bElliChanged;
- FX_INT32 m_iEllipsisWidth;
+ int32_t m_iEllipsisWidth;
CFX_WideString m_wsText;
CFX_RectF m_rtClip;
CFX_RectF m_rtLogicClip;
CFX_Matrix m_Matrix;
CFDE_TTOLineArray m_ttoLines;
- FX_INT32 m_iCurLine;
- FX_INT32 m_iCurPiece;
- FX_INT32 m_iTotalLines;
+ int32_t m_iCurLine;
+ int32_t m_iCurPiece;
+ int32_t m_iTotalLines;
FXTEXT_CHARPOS *m_pCharPos;
- FX_INT32 m_iCharPosSize;
+ int32_t m_iCharPosSize;
IFDE_RenderDevice *m_pRenderDevice;
CFX_Int32Array m_hotKeys;
CFX_RectFArray m_rectArray;
|