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

Side by Side Diff: xfa/fxfa/app/xfa_textlayout.h

Issue 2567503002: Replace CFX_FloatArray with std::vector (Closed)
Patch Set: One less pointer Created 4 years 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 | « xfa/fxfa/app/xfa_ffwidgetacc.cpp ('k') | xfa/fxfa/app/xfa_textlayout.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 XFA_FXFA_APP_XFA_TEXTLAYOUT_H_ 7 #ifndef XFA_FXFA_APP_XFA_TEXTLAYOUT_H_
8 #define XFA_FXFA_APP_XFA_TEXTLAYOUT_H_ 8 #define XFA_FXFA_APP_XFA_TEXTLAYOUT_H_
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <vector>
12 13
13 #include "xfa/fde/css/fde_css.h" 14 #include "xfa/fde/css/fde_css.h"
14 #include "xfa/fde/fde_gedevice.h" 15 #include "xfa/fde/fde_gedevice.h"
15 #include "xfa/fgas/layout/fgas_rtfbreak.h" 16 #include "xfa/fgas/layout/fgas_rtfbreak.h"
16 #include "xfa/fxfa/parser/xfa_object.h" 17 #include "xfa/fxfa/parser/xfa_object.h"
17 #include "xfa/fxfa/xfa_ffdoc.h" 18 #include "xfa/fxfa/xfa_ffdoc.h"
18 19
19 #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001 20 #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001
20 21
21 class CFDE_CSSStyleSelector; 22 class CFDE_CSSStyleSelector;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 FX_FLOAT m_fLastPos; 149 FX_FLOAT m_fLastPos;
149 FX_FLOAT m_fStartLineOffset; 150 FX_FLOAT m_fStartLineOffset;
150 int32_t m_iChar; 151 int32_t m_iChar;
151 int32_t m_iLines; 152 int32_t m_iLines;
152 int32_t m_iTotalLines; 153 int32_t m_iTotalLines;
153 CFDE_XMLNode* m_pXMLNode; 154 CFDE_XMLNode* m_pXMLNode;
154 CXFA_Node* m_pNode; 155 CXFA_Node* m_pNode;
155 IFDE_CSSComputedStyle* m_pParentStyle; 156 IFDE_CSSComputedStyle* m_pParentStyle;
156 CFX_ArrayTemplate<FX_FLOAT> m_lineHeights; 157 CFX_ArrayTemplate<FX_FLOAT> m_lineHeights;
157 uint32_t m_dwFlags; 158 uint32_t m_dwFlags;
158 CFX_FloatArray m_BlocksHeight; 159 std::vector<FX_FLOAT> m_BlocksHeight;
159 }; 160 };
160 161
161 class CXFA_LinkUserData : public IFX_Retainable, public CFX_Target { 162 class CXFA_LinkUserData : public IFX_Retainable, public CFX_Target {
162 public: 163 public:
163 CXFA_LinkUserData(IFX_MemoryAllocator* pAllocator, FX_WCHAR* pszText); 164 CXFA_LinkUserData(IFX_MemoryAllocator* pAllocator, FX_WCHAR* pszText);
164 ~CXFA_LinkUserData() override; 165 ~CXFA_LinkUserData() override;
165 166
166 // IFX_Retainable: 167 // IFX_Retainable:
167 uint32_t Retain() override; 168 uint32_t Retain() override;
168 uint32_t Release() override; 169 uint32_t Release() override;
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 std::unique_ptr<CXFA_LoaderContext> m_pLoader; 346 std::unique_ptr<CXFA_LoaderContext> m_pLoader;
346 int32_t m_iLines; 347 int32_t m_iLines;
347 FX_FLOAT m_fMaxWidth; 348 FX_FLOAT m_fMaxWidth;
348 CXFA_TextParser m_textParser; 349 CXFA_TextParser m_textParser;
349 CXFA_PieceLineArray m_pieceLines; 350 CXFA_PieceLineArray m_pieceLines;
350 std::unique_ptr<CXFA_TextTabstopsContext> m_pTabstopContext; 351 std::unique_ptr<CXFA_TextTabstopsContext> m_pTabstopContext;
351 bool m_bBlockContinue; 352 bool m_bBlockContinue;
352 }; 353 };
353 354
354 #endif // XFA_FXFA_APP_XFA_TEXTLAYOUT_H_ 355 #endif // XFA_FXFA_APP_XFA_TEXTLAYOUT_H_
OLDNEW
« no previous file with comments | « xfa/fxfa/app/xfa_ffwidgetacc.cpp ('k') | xfa/fxfa/app/xfa_textlayout.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698