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 .

15 files changed, 33 insertions, 33 deletions

diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
index 5a45d0aa39..30968a5bea 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_CNS1CID2Unicode_5[19088] = {
+const uint16_t g_FXCMAP_CNS1CID2Unicode_5[19088] = {
     0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
     0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030,
     0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp
index 532ecd1013..1b19edc3c4 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_B5pc_H_0[247 * 3] = {
+const uint16_t g_FXCMAP_B5pc_H_0[247 * 3] = {
     0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x003D, 0x00FD, 0x00FF, 0x0060,
     0xA140, 0xA158, 0x0063, 0xA159, 0xA15C, 0x35AF, 0xA15D, 0xA17E, 0x0080,
     0xA1A1, 0xA1F5, 0x00A2, 0xA1F6, 0xA1F6, 0x00F8, 0xA1F7, 0xA1F7, 0x00F7,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp
index 482c4db05f..b872a69ab5 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_B5pc_V_0[12 * 3] = {
+const uint16_t g_FXCMAP_B5pc_V_0[12 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1,
     0xA15D, 0xA15E, 0x0082, 0xA161, 0xA162, 0x0086, 0xA165, 0xA166, 0x008A,
     0xA169, 0xA16A, 0x008E, 0xA16D, 0xA16E, 0x0092, 0xA171, 0xA172, 0x0096,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp
index 3d61451403..ab893832bb 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_CNS_EUC_H_0[157 * 3] = {
+const uint16_t g_FXCMAP_CNS_EUC_H_0[157 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1FE, 0x0063, 0xA2A1, 0xA2FE, 0x00C1,
     0xA3A1, 0xA3CE, 0x011F, 0xA4A1, 0xA4FE, 0x014D, 0xA5A1, 0xA5EC, 0x01AB,
     0xA5EE, 0xA5F0, 0x01F7, 0xA6A1, 0xA6BE, 0x01FA, 0xA7A1, 0xA7A1, 0x0253,
@@ -62,7 +62,7 @@ const FX_WORD g_FXCMAP_CNS_EUC_H_0[157 * 3] = {
     0xFDA1, 0xFDCB, 0x1741,
 };
 
-const FX_WORD g_FXCMAP_CNS_EUC_H_0_DWord[238 * 4] = {
+const uint16_t g_FXCMAP_CNS_EUC_H_0_DWord[238 * 4] = {
     0x8EA1, 0xA1A1, 0xA1FE, 0x0063, 0x8EA1, 0xA2A1, 0xA2FE, 0x00C1, 0x8EA1,
     0xA3A1, 0xA3CE, 0x011F, 0x8EA1, 0xA4A1, 0xA4FE, 0x014D, 0x8EA1, 0xA5A1,
     0xA5EC, 0x01AB, 0x8EA1, 0xA5EE, 0xA5F0, 0x01F7, 0x8EA1, 0xA6A1, 0xA6BE,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp
index 5348785d10..e3137ad6eb 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_CNS_EUC_V_0[180 * 3] = {
+const uint16_t g_FXCMAP_CNS_EUC_V_0[180 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1AB, 0x0063, 0xA1AC, 0xA1AC, 0x354E,
     0xA1AD, 0xA1BA, 0x006F, 0xA1BB, 0xA1BB, 0x007C, 0xA1BC, 0xA1BC, 0x007E,
     0xA1BD, 0xA1BD, 0x007E, 0xA1BE, 0xA1BF, 0x0082, 0xA1C0, 0xA1C1, 0x0082,
@@ -69,7 +69,7 @@ const FX_WORD g_FXCMAP_CNS_EUC_V_0[180 * 3] = {
     0xFBA1, 0xFBFE, 0x1685, 0xFCA1, 0xFCFE, 0x16E3, 0xFDA1, 0xFDCB, 0x1741,
 };
 
-const FX_WORD g_FXCMAP_CNS_EUC_V_0_DWord[261 * 4] = {
+const uint16_t g_FXCMAP_CNS_EUC_V_0_DWord[261 * 4] = {
     0x8EA1, 0xA1A1, 0xA1AB, 0x0063, 0x8EA1, 0xA1AC, 0xA1AC, 0x354E, 0x8EA1,
     0xA1AD, 0xA1BA, 0x006F, 0x8EA1, 0xA1BB, 0xA1BB, 0x007C, 0x8EA1, 0xA1BC,
     0xA1BC, 0x007E, 0x8EA1, 0xA1BD, 0xA1BD, 0x007E, 0x8EA1, 0xA1BE, 0xA1BF,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp
index 5f7ccd42ab..291ab2627c 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_ETen_B5_H_0[254 * 3] = {
+const uint16_t g_FXCMAP_ETen_B5_H_0[254 * 3] = {
     0x0020, 0x007E, 0x3550, 0xA140, 0xA158, 0x0063, 0xA159, 0xA15C, 0x35AF,
     0xA15D, 0xA17E, 0x0080, 0xA1A1, 0xA1F5, 0x00A2, 0xA1F6, 0xA1F6, 0x00F8,
     0xA1F7, 0xA1F7, 0x00F7, 0xA1F8, 0xA1FE, 0x00F9, 0xA240, 0xA27E, 0x0100,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp
index 3de105a413..dfbc1e35ba 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_ETen_B5_V_0[13 * 3] = {
+const uint16_t g_FXCMAP_ETen_B5_V_0[13 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C,
     0x35B1, 0xA15D, 0xA15E, 0x0082, 0xA161, 0xA162, 0x0086, 0xA165,
     0xA166, 0x008A, 0xA169, 0xA16A, 0x008E, 0xA16D, 0xA16E, 0x0092,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp
index 267fee6af8..40fae5086a 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp
@@ -6,6 +6,6 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_ETenms_B5_H_0[1 * 3] = {
+const uint16_t g_FXCMAP_ETenms_B5_H_0[1 * 3] = {
     0x0020, 0x007E, 0x0001,
 };
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp
index 4f555fadba..b7f79e44bb 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_ETenms_B5_V_0[18 * 3] = {
+const uint16_t g_FXCMAP_ETenms_B5_V_0[18 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA14C, 0xA14C, 0x006D, 0xA156, 0xA156, 0x0138,
     0xA158, 0xA158, 0x007A, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1,
     0xA15D, 0xA15E, 0x0082, 0xA161, 0xA162, 0x0086, 0xA165, 0xA166, 0x008A,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp
index 67459a505f..170c33052b 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_HKscs_B5_H_5[1210 * 3] = {
+const uint16_t g_FXCMAP_HKscs_B5_H_5[1210 * 3] = {
     0x0020, 0x007E, 0x0001, 0x8740, 0x8765, 0x4A15, 0x8767, 0x8779, 0x4A3B,
     0x8840, 0x8855, 0x44C9, 0x8856, 0x887E, 0x4961, 0x88A1, 0x88A8, 0x498A,
     0x88A9, 0x88AA, 0x499C, 0x8940, 0x8941, 0x4534, 0x8943, 0x8943, 0x4536,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp
index d9cbab8826..cfb1817c0d 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_HKscs_B5_V_5[13 * 3] = {
+const uint16_t g_FXCMAP_HKscs_B5_V_5[13 * 3] = {
     0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C,
     0x35B1, 0xA15D, 0xA15E, 0x0082, 0xA161, 0xA162, 0x0086, 0xA165,
     0xA166, 0x008A, 0xA169, 0xA16A, 0x008E, 0xA16D, 0xA16E, 0x0092,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp
index f02c9dc655..64e52de650 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_UniCNS_UCS2_H_3[16418 * 3] = {
+const uint16_t g_FXCMAP_UniCNS_UCS2_H_3[16418 * 3] = {
     0x0020, 0x007E, 0x0001, 0x00A2, 0x00A3, 0x0106, 0x00A5, 0x00A5, 0x0104,
     0x00A7, 0x00A7, 0x00B2, 0x00A8, 0x00A8, 0x35B3, 0x00AC, 0x00AC, 0x36E1,
     0x00B0, 0x00B0, 0x0118, 0x00B1, 0x00B1, 0x00D4, 0x00B7, 0x00B7, 0x0073,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp
index b77835c3f3..e1bb27c2f5 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_UniCNS_UCS2_V_3[13 * 3] = {
+const uint16_t g_FXCMAP_UniCNS_UCS2_V_3[13 * 3] = {
     0x2013, 0x2013, 0x0078, 0x2014, 0x2014, 0x007A, 0x2025, 0x2025,
     0x006D, 0x3008, 0x3009, 0x0096, 0x300A, 0x300B, 0x0092, 0x300C,
     0x300D, 0x009A, 0x300E, 0x300F, 0x009E, 0x3010, 0x3011, 0x008E,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp
index c30dc46568..5cee7b2f8c 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h"
 
-const FX_WORD g_FXCMAP_UniCNS_UTF16_H_0[14557 * 2] = {
+const uint16_t g_FXCMAP_UniCNS_UTF16_H_0[14557 * 2] = {
     0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024,
     0x0005, 0x0025, 0x0006, 0x0026, 0x0007, 0x0027, 0x0008, 0x0028, 0x0009,
     0x0029, 0x000A, 0x002A, 0x000B, 0x002B, 0x000C, 0x002C, 0x000D, 0x002D,
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
index 249d529b91..bef9f6c04d 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
@@ -7,23 +7,23 @@
 #ifndef CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
 #define CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
 
-#include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
+#include <stdint.h>
 
-extern const FX_WORD g_FXCMAP_B5pc_H_0[];
-extern const FX_WORD g_FXCMAP_B5pc_V_0[];
-extern const FX_WORD g_FXCMAP_HKscs_B5_H_5[];
-extern const FX_WORD g_FXCMAP_HKscs_B5_V_5[];
-extern const FX_WORD g_FXCMAP_ETen_B5_H_0[];
-extern const FX_WORD g_FXCMAP_ETen_B5_V_0[];
-extern const FX_WORD g_FXCMAP_ETenms_B5_H_0[];
-extern const FX_WORD g_FXCMAP_ETenms_B5_V_0[];
-extern const FX_WORD g_FXCMAP_CNS_EUC_H_0[];
-extern const FX_WORD g_FXCMAP_CNS_EUC_H_0_DWord[];
-extern const FX_WORD g_FXCMAP_CNS_EUC_V_0[];
-extern const FX_WORD g_FXCMAP_CNS_EUC_V_0_DWord[];
-extern const FX_WORD g_FXCMAP_UniCNS_UCS2_H_3[];
-extern const FX_WORD g_FXCMAP_UniCNS_UCS2_V_3[];
-extern const FX_WORD g_FXCMAP_UniCNS_UTF16_H_0[];
-extern const FX_WORD g_FXCMAP_CNS1CID2Unicode_5[];
+extern const uint16_t g_FXCMAP_B5pc_H_0[];
+extern const uint16_t g_FXCMAP_B5pc_V_0[];
+extern const uint16_t g_FXCMAP_HKscs_B5_H_5[];
+extern const uint16_t g_FXCMAP_HKscs_B5_V_5[];
+extern const uint16_t g_FXCMAP_ETen_B5_H_0[];
+extern const uint16_t g_FXCMAP_ETen_B5_V_0[];
+extern const uint16_t g_FXCMAP_ETenms_B5_H_0[];
+extern const uint16_t g_FXCMAP_ETenms_B5_V_0[];
+extern const uint16_t g_FXCMAP_CNS_EUC_H_0[];
+extern const uint16_t g_FXCMAP_CNS_EUC_H_0_DWord[];
+extern const uint16_t g_FXCMAP_CNS_EUC_V_0[];
+extern const uint16_t g_FXCMAP_CNS_EUC_V_0_DWord[];
+extern const uint16_t g_FXCMAP_UniCNS_UCS2_H_3[];
+extern const uint16_t g_FXCMAP_UniCNS_UCS2_V_3[];
+extern const uint16_t g_FXCMAP_UniCNS_UTF16_H_0[];
+extern const uint16_t g_FXCMAP_CNS1CID2Unicode_5[];
 
 #endif  // CORE_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_