summaryrefslogtreecommitdiff
path: root/core/src/reflow/reflowedpage.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-09 13:24:12 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-09 13:24:12 -0700
commitbfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch)
tree4cfbe682869d89900f33751c37f6a84865beeb0a /core/src/reflow/reflowedpage.h
parentb116136da234afcad018bb44a3ccb64b9ad2a554 (diff)
downloadpdfium-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 'core/src/reflow/reflowedpage.h')
-rw-r--r--core/src/reflow/reflowedpage.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/reflow/reflowedpage.h b/core/src/reflow/reflowedpage.h
index 3fef553d7a..79b4937bdb 100644
--- a/core/src/reflow/reflowedpage.h
+++ b/core/src/reflow/reflowedpage.h
@@ -48,14 +48,14 @@ protected:
void ProcessTextObject(CPDF_TextObject *pObj, FX_FLOAT reflowWidth, CFX_AffineMatrix objMatrix);
void ProcessPathObject(CPDF_PathObject *pObj, FX_FLOAT reflowWidth);
void ProcessUnitaryObjs(CPDF_PageObjects *pObjs, FX_FLOAT reflowWidth, CFX_AffineMatrix objMatrix);
- FX_INT32 LogicPreObj(CPDF_TextObject* pObj);
+ int32_t LogicPreObj(CPDF_TextObject* pObj);
int ProcessInsertObject(CPDF_TextObject* pObj, CFX_AffineMatrix formMatrix);
FX_WCHAR GetPreChar();
FX_BOOL IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2);
int GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont) const;
FX_BOOL IsCanBreakAfter(FX_DWORD unicode);
FX_BOOL IsCanBreakBefore(FX_DWORD unicode);
- FX_INT32 GetElementTypes(LayoutType layoutType);
+ int32_t GetElementTypes(LayoutType layoutType);
void CreateRFData(CPDF_PageObject* pObj, CFX_AffineMatrix* pMatrix = NULL);
CRF_CharState* GetCharState(CPDF_TextObject* pObj, CPDF_Font* pFont, FX_FLOAT fHeight, FX_ARGB color);
FX_FLOAT ConverWidth(FX_FLOAT width);
@@ -169,15 +169,15 @@ public:
{
return this;
};
- void GetDisplayMatrix(CFX_AffineMatrix& matrix, FX_INT32 xPos, FX_INT32 yPos, FX_INT32 xSize, FX_INT32 ySize, FX_INT32 iRotate, const CFX_AffineMatrix* pPageMatrix);
+ void GetDisplayMatrix(CFX_AffineMatrix& matrix, int32_t xPos, int32_t yPos, int32_t xSize, int32_t ySize, int32_t iRotate, const CFX_AffineMatrix* pPageMatrix);
FX_FLOAT GetPageHeight() ;
FX_FLOAT GetPageWidth()
{
return m_PageWidth;
};
- void FocusGetData(const CFX_AffineMatrix matrix, FX_INT32 x, FX_INT32 y, CFX_ByteString& str);
- FX_BOOL FocusGetPosition(const CFX_AffineMatrix matrix, CFX_ByteString str, FX_INT32& x, FX_INT32& y);
+ void FocusGetData(const CFX_AffineMatrix matrix, int32_t x, int32_t y, CFX_ByteString& str);
+ FX_BOOL FocusGetPosition(const CFX_AffineMatrix matrix, CFX_ByteString str, int32_t& x, int32_t& y);
CRF_DataPtrArray* m_pReflowed;
FX_FLOAT m_PageWidth;
FX_FLOAT m_PageHeight;