summaryrefslogtreecommitdiff
path: root/core/include/reflow
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/include/reflow
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/include/reflow')
-rw-r--r--core/include/reflow/fpdf_layout.h2
-rw-r--r--core/include/reflow/reflowengine.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/core/include/reflow/fpdf_layout.h b/core/include/reflow/fpdf_layout.h
index ebd879c764..b1038db329 100644
--- a/core/include/reflow/fpdf_layout.h
+++ b/core/include/reflow/fpdf_layout.h
@@ -252,7 +252,7 @@ typedef struct _LayoutProviderStyle {
m_Language = LP_Lang_Unknow;
m_bIgnoreInvisibleText = TRUE;
}
- FX_INT32 m_Language;
+ int32_t m_Language;
FX_BOOL m_bIgnoreInvisibleText;
} LAYOUTPROVIDER_STYLE;
class IPDF_LayoutProvider
diff --git a/core/include/reflow/reflowengine.h b/core/include/reflow/reflowengine.h
index af3c943e97..30c7174053 100644
--- a/core/include/reflow/reflowengine.h
+++ b/core/include/reflow/reflowengine.h
@@ -22,11 +22,11 @@ public:
virtual CFX_PrivateData* GetPrivateDataCtrl() = 0;
- virtual void GetDisplayMatrix(CFX_AffineMatrix& matrix, FX_INT32 xPos, FX_INT32 yPos, FX_INT32 xSize, FX_INT32 ySize, FX_INT32 iRotate, const CFX_AffineMatrix* pPageMatrix) = 0;
+ virtual void GetDisplayMatrix(CFX_AffineMatrix& matrix, int32_t xPos, int32_t yPos, int32_t xSize, int32_t ySize, int32_t iRotate, const CFX_AffineMatrix* pPageMatrix) = 0;
virtual FX_FLOAT GetPageHeight() = 0;
virtual FX_FLOAT GetPageWidth() = 0;
- virtual void FocusGetData(const CFX_AffineMatrix matrix, FX_INT32 x, FX_INT32 y, CFX_ByteString& str) = 0;
- virtual FX_BOOL FocusGetPosition(const CFX_AffineMatrix matrix, CFX_ByteString str, FX_INT32& x, FX_INT32& y) = 0;
+ virtual void FocusGetData(const CFX_AffineMatrix matrix, int32_t x, int32_t y, CFX_ByteString& str) = 0;
+ virtual FX_BOOL FocusGetPosition(const CFX_AffineMatrix matrix, CFX_ByteString str, int32_t& x, int32_t& y) = 0;
};
typedef struct _RF_ParseStyle {
_RF_ParseStyle()