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

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

Issue 1832173003: Remove FX_DWORD from core/ and delete definition (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: 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/fxcrt/include/fx_system.h ('k') | core/fxcrt/include/fx_xml.h » ('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_FXCRT_INCLUDE_FX_UCD_H_ 7 #ifndef CORE_FXCRT_INCLUDE_FX_UCD_H_
8 #define CORE_FXCRT_INCLUDE_FX_UCD_H_ 8 #define CORE_FXCRT_INCLUDE_FX_UCD_H_
9 9
10 #include "core/fxcrt/include/fx_basic.h" 10 #include "core/fxcrt/include/fx_basic.h"
(...skipping 17 matching lines...) Expand all
28 FX_BIDICLASS_WS = 12, // Whitespace 28 FX_BIDICLASS_WS = 12, // Whitespace
29 FX_BIDICLASS_B = 13, // Paragraph Separator 29 FX_BIDICLASS_B = 13, // Paragraph Separator
30 FX_BIDICLASS_RLO = 14, // Right-to-Left Override 30 FX_BIDICLASS_RLO = 14, // Right-to-Left Override
31 FX_BIDICLASS_RLE = 15, // Right-to-Left Embedding 31 FX_BIDICLASS_RLE = 15, // Right-to-Left Embedding
32 FX_BIDICLASS_LRO = 16, // Left-to-Right Override 32 FX_BIDICLASS_LRO = 16, // Left-to-Right Override
33 FX_BIDICLASS_LRE = 17, // Left-to-Right Embedding 33 FX_BIDICLASS_LRE = 17, // Left-to-Right Embedding
34 FX_BIDICLASS_PDF = 18, // Pop Directional Format 34 FX_BIDICLASS_PDF = 18, // Pop Directional Format
35 FX_BIDICLASS_N = FX_BIDICLASS_ON, 35 FX_BIDICLASS_N = FX_BIDICLASS_ON,
36 }; 36 };
37 37
38 extern const FX_DWORD kTextLayoutCodeProperties[]; 38 extern const uint32_t kTextLayoutCodeProperties[];
39 extern const size_t kTextLayoutCodePropertiesSize; 39 extern const size_t kTextLayoutCodePropertiesSize;
40 40
41 extern const uint16_t kFXTextLayoutVerticalMirror[]; 41 extern const uint16_t kFXTextLayoutVerticalMirror[];
42 extern const size_t kFXTextLayoutVerticalMirrorSize; 42 extern const size_t kFXTextLayoutVerticalMirrorSize;
43 43
44 extern const uint16_t kFXTextLayoutBidiMirror[]; 44 extern const uint16_t kFXTextLayoutBidiMirror[];
45 extern const size_t kFXTextLayoutBidiMirrorSize; 45 extern const size_t kFXTextLayoutBidiMirrorSize;
46 46
47 FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch); 47 uint32_t FX_GetUnicodeProperties(FX_WCHAR wch);
48 FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical); 48 FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical);
49 49
50 #ifdef PDF_ENABLE_XFA 50 #ifdef PDF_ENABLE_XFA
51 enum FX_CHARBREAKPROP { 51 enum FX_CHARBREAKPROP {
52 FX_CBP_OP = 0, 52 FX_CBP_OP = 0,
53 FX_CBP_CL = 1, 53 FX_CBP_CL = 1,
54 FX_CBP_QU = 2, 54 FX_CBP_QU = 2,
55 FX_CBP_GL = 3, 55 FX_CBP_GL = 3,
56 FX_CBP_NS = 4, 56 FX_CBP_NS = 4,
57 FX_CBP_EX = 5, 57 FX_CBP_EX = 5,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 FX_CHARTYPE_ArabicAlef = (7 << FX_CHARTYPEBITS), 103 FX_CHARTYPE_ArabicAlef = (7 << FX_CHARTYPEBITS),
104 FX_CHARTYPE_ArabicSpecial = (8 << FX_CHARTYPEBITS), 104 FX_CHARTYPE_ArabicSpecial = (8 << FX_CHARTYPEBITS),
105 FX_CHARTYPE_ArabicDistortion = (9 << FX_CHARTYPEBITS), 105 FX_CHARTYPE_ArabicDistortion = (9 << FX_CHARTYPEBITS),
106 FX_CHARTYPE_ArabicNormal = (10 << FX_CHARTYPEBITS), 106 FX_CHARTYPE_ArabicNormal = (10 << FX_CHARTYPEBITS),
107 FX_CHARTYPE_ArabicForm = (11 << FX_CHARTYPEBITS), 107 FX_CHARTYPE_ArabicForm = (11 << FX_CHARTYPEBITS),
108 FX_CHARTYPE_Arabic = (12 << FX_CHARTYPEBITS), 108 FX_CHARTYPE_Arabic = (12 << FX_CHARTYPEBITS),
109 }; 109 };
110 110
111 FX_BOOL FX_IsCtrlCode(FX_WCHAR ch); 111 FX_BOOL FX_IsCtrlCode(FX_WCHAR ch);
112 FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, 112 FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch,
113 FX_DWORD dwProps, 113 uint32_t dwProps,
114 FX_BOOL bRTL, 114 FX_BOOL bRTL,
115 FX_BOOL bVertical); 115 FX_BOOL bVertical);
116 class CFX_Char { 116 class CFX_Char {
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(uint16_t wCharCode, FX_DWORD dwCharProps) 127 CFX_Char(uint16_t wCharCode, uint32_t 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 uint32_t GetCharType() const { return m_dwCharProps & FX_CHARTYPEBITSMASK; }
137 uint16_t 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 uint32_t m_dwCharProps;
141 FX_DWORD m_dwCharStyles; 141 uint32_t 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 {
148 public: 148 public:
149 CFX_TxtChar() 149 CFX_TxtChar()
150 : CFX_Char(), 150 : CFX_Char(),
151 m_dwStatus(0), 151 m_dwStatus(0),
152 m_iBidiClass(0), 152 m_iBidiClass(0),
153 m_iBidiLevel(0), 153 m_iBidiLevel(0),
154 m_iBidiPos(0), 154 m_iBidiPos(0),
155 m_iBidiOrder(0), 155 m_iBidiOrder(0),
156 m_pUserData(NULL) {} 156 m_pUserData(NULL) {}
157 FX_DWORD m_dwStatus; 157 uint32_t m_dwStatus;
158 int16_t m_iBidiClass; 158 int16_t m_iBidiClass;
159 int16_t m_iBidiLevel; 159 int16_t m_iBidiLevel;
160 int16_t m_iBidiPos; 160 int16_t m_iBidiPos;
161 int16_t m_iBidiOrder; 161 int16_t m_iBidiOrder;
162 void* m_pUserData; 162 void* m_pUserData;
163 }; 163 };
164 typedef CFX_ArrayTemplate<CFX_TxtChar> CFX_TxtCharArray; 164 typedef CFX_ArrayTemplate<CFX_TxtChar> CFX_TxtCharArray;
165 class CFX_RTFChar : public CFX_Char { 165 class CFX_RTFChar : public CFX_Char {
166 public: 166 public:
167 CFX_RTFChar() 167 CFX_RTFChar()
168 : CFX_Char(), 168 : CFX_Char(),
169 m_dwStatus(0), 169 m_dwStatus(0),
170 m_iFontSize(0), 170 m_iFontSize(0),
171 m_iFontHeight(0), 171 m_iFontHeight(0),
172 m_iBidiClass(0), 172 m_iBidiClass(0),
173 m_iBidiLevel(0), 173 m_iBidiLevel(0),
174 m_iBidiPos(0), 174 m_iBidiPos(0),
175 m_dwLayoutStyles(0), 175 m_dwLayoutStyles(0),
176 m_dwIdentity(0), 176 m_dwIdentity(0),
177 m_pUserData(NULL) {} 177 m_pUserData(NULL) {}
178 FX_DWORD m_dwStatus; 178 uint32_t m_dwStatus;
179 int32_t m_iFontSize; 179 int32_t m_iFontSize;
180 int32_t m_iFontHeight; 180 int32_t m_iFontHeight;
181 int16_t m_iBidiClass; 181 int16_t m_iBidiClass;
182 int16_t m_iBidiLevel; 182 int16_t m_iBidiLevel;
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 uint32_t m_dwLayoutStyles;
186 FX_DWORD m_dwIdentity; 186 uint32_t 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_FXCRT_INCLUDE_FX_UCD_H_ 192 #endif // CORE_FXCRT_INCLUDE_FX_UCD_H_
OLDNEW
« no previous file with comments | « core/fxcrt/include/fx_system.h ('k') | core/fxcrt/include/fx_xml.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698