From 62a70f90c49cf7714c960186eb063ad55333e6f3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 21 Mar 2016 15:00:20 -0700 Subject: Remove FX_WORD in favor of uint16_t. It isn't buying us anthing, and it looks strange in a struct when other uint types are already present. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1821043003 . --- core/include/fpdfdoc/fpdf_ap.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/include/fpdfdoc/fpdf_ap.h') diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h index 62e3907593..b468d14d20 100644 --- a/core/include/fpdfdoc/fpdf_ap.h +++ b/core/include/fpdfdoc/fpdf_ap.h @@ -53,14 +53,14 @@ class CPVT_Provider : public IPDF_VariableText_Provider { // IPDF_VariableText_Provider int32_t GetCharWidth(int32_t nFontIndex, - FX_WORD word, + uint16_t word, int32_t nWordStyle) override; int32_t GetTypeAscent(int32_t nFontIndex) override; int32_t GetTypeDescent(int32_t nFontIndex) override; - int32_t GetWordFontIndex(FX_WORD word, + int32_t GetWordFontIndex(uint16_t word, int32_t charset, int32_t nFontIndex) override; - FX_BOOL IsLatinWord(FX_WORD word) override; + FX_BOOL IsLatinWord(uint16_t word) override; int32_t GetDefaultFontIndex() override; private: @@ -82,7 +82,7 @@ class CPVT_GenerateAP { IPDF_VariableText_Iterator* pIterator, const CFX_FloatPoint& ptOffset, FX_BOOL bContinuous, - FX_WORD SubWord = 0, + uint16_t SubWord = 0, const CPVT_WordRange* pVisible = NULL); static CFX_ByteString GenerateBorderAP(const CFX_FloatRect& rect, -- cgit v1.2.3