Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: xfa/src/fgas/src/layout/fx_rtfbreak.h

Issue 1172793002: Merge to XFA: Use stdint.h types throughout PDFium. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/src/fgas/src/layout/fx_linebreak.cpp ('k') | xfa/src/fgas/src/layout/fx_rtfbreak.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/src/fgas/src/layout/fx_rtfbreak.h
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h
index c8f69277da6fc506f41247f721662c2378dd2dc9..394d433412b1b4c8aae14b4da48d1f7c234f448e 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.h
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h
@@ -22,35 +22,35 @@ public:
{
RemoveAll();
}
- FX_INT32 CountChars() const
+ int32_t CountChars() const
{
return m_LineChars.GetSize();
}
- CFX_RTFChar& GetChar(FX_INT32 index)
+ CFX_RTFChar& GetChar(int32_t index)
{
FXSYS_assert(index > -1 && index < m_LineChars.GetSize());
return *m_LineChars.GetDataPtr(index);
}
- CFX_RTFChar* GetCharPtr(FX_INT32 index)
+ CFX_RTFChar* GetCharPtr(int32_t index)
{
FXSYS_assert(index > -1 && index < m_LineChars.GetSize());
return m_LineChars.GetDataPtr(index);
}
- FX_INT32 CountPieces() const
+ int32_t CountPieces() const
{
return m_LinePieces.GetSize();
}
- CFX_RTFPiece& GetPiece(FX_INT32 index) const
+ CFX_RTFPiece& GetPiece(int32_t index) const
{
FXSYS_assert(index > -1 && index < m_LinePieces.GetSize());
return m_LinePieces.GetAt(index);
}
- CFX_RTFPiece* GetPiecePtr(FX_INT32 index) const
+ CFX_RTFPiece* GetPiecePtr(int32_t index) const
{
FXSYS_assert(index > -1 && index < m_LinePieces.GetSize());
return m_LinePieces.GetPtrAt(index);
}
- FX_INT32 GetLineEnd() const
+ int32_t GetLineEnd() const
{
return m_iStart + m_iWidth;
}
@@ -58,8 +58,8 @@ public:
{
CFX_RTFChar *pChar;
IFX_Unknown *pUnknown;
- FX_INT32 iCount = m_LineChars.GetSize();
- for (FX_INT32 i = 0; i < iCount; i ++) {
+ int32_t iCount = m_LineChars.GetSize();
+ for (int32_t i = 0; i < iCount; i ++) {
pChar = m_LineChars.GetDataPtr(i);
if ((pUnknown = pChar->m_pUserData) != NULL) {
pUnknown->Release();
@@ -73,10 +73,10 @@ public:
}
CFX_RTFCharArray m_LineChars;
CFX_RTFPieceArray m_LinePieces;
- FX_INT32 m_iStart;
- FX_INT32 m_iWidth;
- FX_INT32 m_iArabicChars;
- FX_INT32 m_iMBCSChars;
+ int32_t m_iStart;
+ int32_t m_iWidth;
+ int32_t m_iArabicChars;
+ int32_t m_iMBCSChars;
};
class CFX_RTFBreak : public IFX_RTFBreak
{
@@ -103,75 +103,75 @@ public:
virtual void SetDefaultChar(FX_WCHAR wch);
virtual void SetLineBreakChar(FX_WCHAR wch);
virtual void SetLineBreakTolerance(FX_FLOAT fTolerance);
- virtual void SetHorizontalScale(FX_INT32 iScale);
- virtual void SetVerticalScale(FX_INT32 iScale);
- virtual void SetCharRotation(FX_INT32 iCharRotation);
+ virtual void SetHorizontalScale(int32_t iScale);
+ virtual void SetVerticalScale(int32_t iScale);
+ virtual void SetCharRotation(int32_t iCharRotation);
virtual void SetCharSpace(FX_FLOAT fCharSpace);
virtual void SetWordSpace(FX_BOOL bDefault, FX_FLOAT fWordSpace);
virtual void SetReadingOrder(FX_BOOL bRTL = FALSE);
- virtual void SetAlignment(FX_INT32 iAlignment = FX_RTFLINEALIGNMENT_Left);
+ virtual void SetAlignment(int32_t iAlignment = FX_RTFLINEALIGNMENT_Left);
virtual void SetUserData(IFX_Unknown *pUserData);
virtual FX_DWORD AppendChar(FX_WCHAR wch);
virtual FX_DWORD EndBreak(FX_DWORD dwStatus = FX_RTFBREAK_PieceBreak);
- virtual FX_INT32 CountBreakPieces() const;
- virtual const CFX_RTFPiece* GetBreakPiece(FX_INT32 index) const;
+ virtual int32_t CountBreakPieces() const;
+ virtual const CFX_RTFPiece* GetBreakPiece(int32_t index) const;
virtual void GetLineRect(CFX_RectF &rect) const;
virtual void ClearBreakPieces();
virtual void Reset();
- virtual FX_INT32 GetDisplayPos(FX_LPCRTFTEXTOBJ pText, FXTEXT_CHARPOS *pCharPos, FX_BOOL bCharCode = FALSE, CFX_WideString *pWSForms = NULL, FX_AdjustCharDisplayPos pAdjustPos = NULL) const;
- virtual FX_INT32 GetCharRects(FX_LPCRTFTEXTOBJ pText, CFX_RectFArray &rtArray, FX_BOOL bCharBBox = FALSE) const;
+ virtual int32_t GetDisplayPos(FX_LPCRTFTEXTOBJ pText, FXTEXT_CHARPOS *pCharPos, FX_BOOL bCharCode = FALSE, CFX_WideString *pWSForms = NULL, FX_AdjustCharDisplayPos pAdjustPos = NULL) const;
+ virtual int32_t GetCharRects(FX_LPCRTFTEXTOBJ pText, CFX_RectFArray &rtArray, FX_BOOL bCharBBox = FALSE) const;
FX_DWORD AppendChar_CharCode(FX_WCHAR wch);
- FX_DWORD AppendChar_Combination(CFX_RTFChar *pCurChar, FX_INT32 iRotation);
- FX_DWORD AppendChar_Tab(CFX_RTFChar *pCurChar, FX_INT32 iRotation);
- FX_DWORD AppendChar_Control(CFX_RTFChar *pCurChar, FX_INT32 iRotation);
- FX_DWORD AppendChar_Arabic(CFX_RTFChar *pCurChar, FX_INT32 iRotation);
- FX_DWORD AppendChar_Others(CFX_RTFChar *pCurChar, FX_INT32 iRotation);
+ FX_DWORD AppendChar_Combination(CFX_RTFChar *pCurChar, int32_t iRotation);
+ FX_DWORD AppendChar_Tab(CFX_RTFChar *pCurChar, int32_t iRotation);
+ FX_DWORD AppendChar_Control(CFX_RTFChar *pCurChar, int32_t iRotation);
+ FX_DWORD AppendChar_Arabic(CFX_RTFChar *pCurChar, int32_t iRotation);
+ FX_DWORD AppendChar_Others(CFX_RTFChar *pCurChar, int32_t iRotation);
protected:
FX_DWORD m_dwPolicies;
IFX_ArabicChar *m_pArabicChar;
- FX_INT32 m_iLineStart;
- FX_INT32 m_iLineEnd;
+ int32_t m_iLineStart;
+ int32_t m_iLineEnd;
FX_DWORD m_dwLayoutStyles;
FX_BOOL m_bPagination;
FX_BOOL m_bVertical;
FX_BOOL m_bSingleLine;
FX_BOOL m_bCharCode;
IFX_Font *m_pFont;
- FX_INT32 m_iFontHeight;
- FX_INT32 m_iFontSize;
- FX_INT32 m_iTabWidth;
+ int32_t m_iFontHeight;
+ int32_t m_iFontSize;
+ int32_t m_iTabWidth;
CFX_Int32Array m_PositionedTabs;
FX_BOOL m_bOrphanLine;
FX_WCHAR m_wDefChar;
- FX_INT32 m_iDefChar;
+ int32_t m_iDefChar;
FX_WCHAR m_wLineBreakChar;
- FX_INT32 m_iHorizontalScale;
- FX_INT32 m_iVerticalScale;
- FX_INT32 m_iLineRotation;
- FX_INT32 m_iCharRotation;
- FX_INT32 m_iRotation;
- FX_INT32 m_iCharSpace;
+ int32_t m_iHorizontalScale;
+ int32_t m_iVerticalScale;
+ int32_t m_iLineRotation;
+ int32_t m_iCharRotation;
+ int32_t m_iRotation;
+ int32_t m_iCharSpace;
FX_BOOL m_bWordSpace;
- FX_INT32 m_iWordSpace;
+ int32_t m_iWordSpace;
FX_BOOL m_bRTL;
- FX_INT32 m_iAlignment;
+ int32_t m_iAlignment;
IFX_Unknown *m_pUserData;
FX_DWORD m_dwCharType;
FX_DWORD m_dwIdentity;
CFX_RTFLine m_RTFLine1;
CFX_RTFLine m_RTFLine2;
CFX_RTFLine *m_pCurLine;
- FX_INT32 m_iReady;
- FX_INT32 m_iTolerance;
- FX_INT32 GetLineRotation(FX_DWORD dwStyles) const;
+ int32_t m_iReady;
+ int32_t m_iTolerance;
+ int32_t GetLineRotation(FX_DWORD dwStyles) const;
void SetBreakStatus();
- CFX_RTFChar* GetLastChar(FX_INT32 index) const;
+ CFX_RTFChar* GetLastChar(int32_t index) const;
CFX_RTFLine* GetRTFLine(FX_BOOL bReady) const;
CFX_RTFPieceArray* GetRTFPieces(FX_BOOL bReady) const;
FX_DWORD GetUnifiedCharType(FX_DWORD dwType) const;
- FX_INT32 GetLastPositionedTab() const;
- FX_BOOL GetPositionedTab(FX_INT32 &iTabPos) const;
- FX_INT32 GetBreakPos(CFX_RTFCharArray &tca, FX_INT32 &iEndPos, FX_BOOL bAllChars = FALSE, FX_BOOL bOnlyBrk = FALSE);
+ int32_t GetLastPositionedTab() const;
+ FX_BOOL GetPositionedTab(int32_t &iTabPos) const;
+ int32_t GetBreakPos(CFX_RTFCharArray &tca, int32_t &iEndPos, FX_BOOL bAllChars = FALSE, FX_BOOL bOnlyBrk = FALSE);
void SplitTextLine(CFX_RTFLine *pCurLine, CFX_RTFLine *pNextLine, FX_BOOL bAllChars = FALSE);
FX_BOOL EndBreak_SplitLine(CFX_RTFLine *pNextLine, FX_BOOL bAllChars, FX_DWORD dwStatus);
void EndBreak_BidiLine(CFX_TPOArray &tpos, FX_DWORD dwStatus);
« no previous file with comments | « xfa/src/fgas/src/layout/fx_linebreak.cpp ('k') | xfa/src/fgas/src/layout/fx_rtfbreak.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698