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

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

Issue 2060913003: Make code compile with clang_use_chrome_plugin (part II) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: rebase Created 4 years, 6 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_string.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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 uint32_t m_dwCharProps; 145 uint32_t m_dwCharProps;
146 uint32_t m_dwCharStyles; 146 uint32_t m_dwCharStyles;
147 int32_t m_iCharWidth; 147 int32_t m_iCharWidth;
148 int32_t m_iHorizontalScale; 148 int32_t m_iHorizontalScale;
149 int32_t m_iVertialScale; 149 int32_t m_iVertialScale;
150 }; 150 };
151 typedef CFX_ArrayTemplate<CFX_Char> CFX_CharArray; 151 typedef CFX_ArrayTemplate<CFX_Char> CFX_CharArray;
152 class CFX_TxtChar : public CFX_Char { 152 class CFX_TxtChar : public CFX_Char {
153 public: 153 public:
154 CFX_TxtChar() 154 CFX_TxtChar()
155 : CFX_Char(), 155 : m_dwStatus(0),
156 m_dwStatus(0),
157 m_iBidiClass(0), 156 m_iBidiClass(0),
158 m_iBidiLevel(0), 157 m_iBidiLevel(0),
159 m_iBidiPos(0), 158 m_iBidiPos(0),
160 m_iBidiOrder(0), 159 m_iBidiOrder(0),
161 m_pUserData(nullptr) {} 160 m_pUserData(nullptr) {}
162 uint32_t m_dwStatus; 161 uint32_t m_dwStatus;
163 int16_t m_iBidiClass; 162 int16_t m_iBidiClass;
164 int16_t m_iBidiLevel; 163 int16_t m_iBidiLevel;
165 int16_t m_iBidiPos; 164 int16_t m_iBidiPos;
166 int16_t m_iBidiOrder; 165 int16_t m_iBidiOrder;
167 void* m_pUserData; 166 void* m_pUserData;
168 }; 167 };
169 typedef CFX_ArrayTemplate<CFX_TxtChar> CFX_TxtCharArray; 168 typedef CFX_ArrayTemplate<CFX_TxtChar> CFX_TxtCharArray;
170 class CFX_RTFChar : public CFX_Char { 169 class CFX_RTFChar : public CFX_Char {
171 public: 170 public:
172 CFX_RTFChar() 171 CFX_RTFChar();
173 : CFX_Char(), 172 CFX_RTFChar(const CFX_RTFChar& other);
174 m_dwStatus(0), 173
175 m_iFontSize(0),
176 m_iFontHeight(0),
177 m_iBidiClass(0),
178 m_iBidiLevel(0),
179 m_iBidiPos(0),
180 m_dwLayoutStyles(0),
181 m_dwIdentity(0),
182 m_pUserData(nullptr) {}
183 uint32_t m_dwStatus; 174 uint32_t m_dwStatus;
184 int32_t m_iFontSize; 175 int32_t m_iFontSize;
185 int32_t m_iFontHeight; 176 int32_t m_iFontHeight;
186 int16_t m_iBidiClass; 177 int16_t m_iBidiClass;
187 int16_t m_iBidiLevel; 178 int16_t m_iBidiLevel;
188 int16_t m_iBidiPos; 179 int16_t m_iBidiPos;
189 int16_t m_iBidiOrder; 180 int16_t m_iBidiOrder;
190 uint32_t m_dwLayoutStyles; 181 uint32_t m_dwLayoutStyles;
191 uint32_t m_dwIdentity; 182 uint32_t m_dwIdentity;
192 IFX_Retainable* m_pUserData; 183 IFX_Retainable* m_pUserData;
193 }; 184 };
185
186 inline CFX_RTFChar::CFX_RTFChar()
187 : m_dwStatus(0),
188 m_iFontSize(0),
189 m_iFontHeight(0),
190 m_iBidiClass(0),
191 m_iBidiLevel(0),
192 m_iBidiPos(0),
193 m_dwLayoutStyles(0),
194 m_dwIdentity(0),
195 m_pUserData(nullptr) {}
196
197 inline CFX_RTFChar::CFX_RTFChar(const CFX_RTFChar& other) = default;
198
194 typedef CFX_ArrayTemplate<CFX_RTFChar> CFX_RTFCharArray; 199 typedef CFX_ArrayTemplate<CFX_RTFChar> CFX_RTFCharArray;
195 #endif // PDF_ENABLE_XFA 200 #endif // PDF_ENABLE_XFA
196 201
197 #endif // CORE_FXCRT_INCLUDE_FX_UCD_H_ 202 #endif // CORE_FXCRT_INCLUDE_FX_UCD_H_
OLDNEW
« no previous file with comments | « core/fxcrt/include/fx_string.h ('k') | core/fxcrt/include/fx_xml.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698