From 62a70f90c49cf7714c960186eb063ad55333e6f3 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
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 ++++----
 core/include/fpdfdoc/fpdf_vt.h | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'core/include/fpdfdoc')

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,
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index dd2e300162..d79cad42d6 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -216,7 +216,7 @@ struct CPVT_Word {
         fFontSize(0),
         WordProps() {}
 
-  FX_WORD Word;
+  uint16_t Word;
 
   int32_t nCharset;
 
@@ -266,18 +266,18 @@ class IPDF_VariableText_Provider {
   virtual ~IPDF_VariableText_Provider() {}
 
   virtual int32_t GetCharWidth(int32_t nFontIndex,
-                               FX_WORD word,
+                               uint16_t word,
                                int32_t nWordStyle) = 0;
 
   virtual int32_t GetTypeAscent(int32_t nFontIndex) = 0;
 
   virtual int32_t GetTypeDescent(int32_t nFontIndex) = 0;
 
-  virtual int32_t GetWordFontIndex(FX_WORD word,
+  virtual int32_t GetWordFontIndex(uint16_t word,
                                    int32_t charset,
                                    int32_t nFontIndex) = 0;
 
-  virtual FX_BOOL IsLatinWord(FX_WORD word) = 0;
+  virtual FX_BOOL IsLatinWord(uint16_t word) = 0;
 
   virtual int32_t GetDefaultFontIndex() = 0;
 };
@@ -328,7 +328,7 @@ class IPDF_VariableText {
 
   virtual void SetAlignment(int32_t nFormat = 0) = 0;
 
-  virtual void SetPasswordChar(FX_WORD wSubWord = '*') = 0;
+  virtual void SetPasswordChar(uint16_t wSubWord = '*') = 0;
 
   virtual void SetLimitChar(int32_t nLimitChar = 0) = 0;
 
@@ -369,7 +369,7 @@ class IPDF_VariableText {
 
   virtual CPVT_WordPlace InsertWord(
       const CPVT_WordPlace& place,
-      FX_WORD word,
+      uint16_t word,
       int32_t charset = 1,
       const CPVT_WordProps* pWordProps = NULL) = 0;
 
@@ -401,7 +401,7 @@ class IPDF_VariableText {
 
   virtual int32_t GetAlignment() const = 0;
 
-  virtual FX_WORD GetPasswordChar() const = 0;
+  virtual uint16_t GetPasswordChar() const = 0;
 
   virtual int32_t GetCharArray() const = 0;
 
-- 
cgit v1.2.3