Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1524)

Side by Side Diff: core/include/fxcrt/fx_ucd.h

Issue 1821043003: Remove FX_WORD in favor of uint16_t. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Use stdint.h directly, bitfield minefield. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/include/fxcrt/fx_system.h ('k') | fpdfsdk/formfiller/cffl_formfiller.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef CORE_INCLUDE_FXCRT_FX_UCD_H_ 7 #ifndef CORE_INCLUDE_FXCRT_FX_UCD_H_
8 #define CORE_INCLUDE_FXCRT_FX_UCD_H_ 8 #define CORE_INCLUDE_FXCRT_FX_UCD_H_
9 9
10 #include "core/include/fxcrt/fx_basic.h" 10 #include "core/include/fxcrt/fx_basic.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 public: 117 public:
118 CFX_Char() 118 CFX_Char()
119 : m_wCharCode(0), 119 : m_wCharCode(0),
120 m_nBreakType(0), 120 m_nBreakType(0),
121 m_nRotation(0), 121 m_nRotation(0),
122 m_dwCharProps(0), 122 m_dwCharProps(0),
123 m_dwCharStyles(0), 123 m_dwCharStyles(0),
124 m_iCharWidth(0), 124 m_iCharWidth(0),
125 m_iHorizontalScale(100), 125 m_iHorizontalScale(100),
126 m_iVertialScale(100) {} 126 m_iVertialScale(100) {}
127 CFX_Char(FX_WORD wCharCode, FX_DWORD dwCharProps) 127 CFX_Char(uint16_t wCharCode, FX_DWORD dwCharProps)
128 : m_wCharCode(wCharCode), 128 : m_wCharCode(wCharCode),
129 m_nBreakType(0), 129 m_nBreakType(0),
130 m_nRotation(0), 130 m_nRotation(0),
131 m_dwCharProps(dwCharProps), 131 m_dwCharProps(dwCharProps),
132 m_dwCharStyles(0), 132 m_dwCharStyles(0),
133 m_iCharWidth(0), 133 m_iCharWidth(0),
134 m_iHorizontalScale(100), 134 m_iHorizontalScale(100),
135 m_iVertialScale(100) {} 135 m_iVertialScale(100) {}
136 FX_DWORD GetCharType() const { return m_dwCharProps & FX_CHARTYPEBITSMASK; } 136 FX_DWORD GetCharType() const { return m_dwCharProps & FX_CHARTYPEBITSMASK; }
137 FX_WORD m_wCharCode; 137 uint16_t m_wCharCode;
138 uint8_t m_nBreakType; 138 uint8_t m_nBreakType;
139 int8_t m_nRotation; 139 int8_t m_nRotation;
140 FX_DWORD m_dwCharProps; 140 FX_DWORD m_dwCharProps;
141 FX_DWORD m_dwCharStyles; 141 FX_DWORD m_dwCharStyles;
142 int32_t m_iCharWidth; 142 int32_t m_iCharWidth;
143 int32_t m_iHorizontalScale; 143 int32_t m_iHorizontalScale;
144 int32_t m_iVertialScale; 144 int32_t m_iVertialScale;
145 }; 145 };
146 typedef CFX_ArrayTemplate<CFX_Char> CFX_CharArray; 146 typedef CFX_ArrayTemplate<CFX_Char> CFX_CharArray;
147 class CFX_TxtChar : public CFX_Char { 147 class CFX_TxtChar : public CFX_Char {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 int16_t m_iBidiPos; 183 int16_t m_iBidiPos;
184 int16_t m_iBidiOrder; 184 int16_t m_iBidiOrder;
185 FX_DWORD m_dwLayoutStyles; 185 FX_DWORD m_dwLayoutStyles;
186 FX_DWORD m_dwIdentity; 186 FX_DWORD m_dwIdentity;
187 IFX_Unknown* m_pUserData; 187 IFX_Unknown* m_pUserData;
188 }; 188 };
189 typedef CFX_ArrayTemplate<CFX_RTFChar> CFX_RTFCharArray; 189 typedef CFX_ArrayTemplate<CFX_RTFChar> CFX_RTFCharArray;
190 #endif // PDF_ENABLE_XFA 190 #endif // PDF_ENABLE_XFA
191 191
192 #endif // CORE_INCLUDE_FXCRT_FX_UCD_H_ 192 #endif // CORE_INCLUDE_FXCRT_FX_UCD_H_
OLDNEW
« no previous file with comments | « core/include/fxcrt/fx_system.h ('k') | fpdfsdk/formfiller/cffl_formfiller.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698