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

Side by Side Diff: xfa/fee/fde_txtedtpage.h

Issue 1986373002: Remove Release() from IFX_CharIter, use unique_ptrs. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Nit Created 4 years, 7 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 | « xfa/fee/fde_txtedtengine.cpp ('k') | xfa/fee/fde_txtedtpage.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_FEE_FDE_TXTEDTPAGE_H_ 7 #ifndef XFA_FEE_FDE_TXTEDTPAGE_H_
8 #define XFA_FEE_FDE_TXTEDTPAGE_H_ 8 #define XFA_FEE_FDE_TXTEDTPAGE_H_
9 9
10 #include <memory>
11
10 #include "core/fxcrt/include/fx_coordinates.h" 12 #include "core/fxcrt/include/fx_coordinates.h"
11 #include "core/fxcrt/include/fx_string.h" 13 #include "core/fxcrt/include/fx_string.h"
12 #include "xfa/fde/fde_visualset.h" 14 #include "xfa/fde/fde_visualset.h"
13 #include "xfa/fee/ifde_txtedtpage.h" 15 #include "xfa/fee/ifde_txtedtpage.h"
14 #include "xfa/fgas/crt/fgas_utils.h" 16 #include "xfa/fgas/crt/fgas_utils.h"
15 17
16 class IFX_CharIter; 18 class IFX_CharIter;
17 class CFDE_TxtEdtEngine; 19 class CFDE_TxtEdtEngine;
18 class CFDE_TxtEdtPage; 20 class CFDE_TxtEdtPage;
19 class CFDE_TxtEdtParag; 21 class CFDE_TxtEdtParag;
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 int32_t GetWidth(void* pIdentity, int32_t index) const override; 142 int32_t GetWidth(void* pIdentity, int32_t index) const override;
141 143
142 protected: 144 protected:
143 virtual ~CFDE_TxtEdtPage(); 145 virtual ~CFDE_TxtEdtPage();
144 146
145 private: 147 private:
146 void NormalizePt2Rect(CFX_PointF& ptF, 148 void NormalizePt2Rect(CFX_PointF& ptF,
147 const CFX_RectF& rtF, 149 const CFX_RectF& rtF,
148 FX_FLOAT fTolerance) const; 150 FX_FLOAT fTolerance) const;
149 151
150 IFX_CharIter* m_pIter; 152 std::unique_ptr<IFX_CharIter> m_pIter;
151 CFDE_TxtEdtTextSet* m_pTextSet; 153 CFDE_TxtEdtTextSet* m_pTextSet;
152 CFDE_TxtEdtEngine* m_pEditEngine; 154 CFDE_TxtEdtEngine* m_pEditEngine;
153 CFDE_TXTEDTPieceMassArray m_PieceMassArr; 155 CFDE_TXTEDTPieceMassArray m_PieceMassArr;
154 CFDE_TxtEdtParag* m_pBgnParag; 156 CFDE_TxtEdtParag* m_pBgnParag;
155 CFDE_TxtEdtParag* m_pEndParag; 157 CFDE_TxtEdtParag* m_pEndParag;
156 int32_t m_nRefCount; 158 int32_t m_nRefCount;
157 int32_t m_nPageStart; 159 int32_t m_nPageStart;
158 int32_t m_nCharCount; 160 int32_t m_nCharCount;
159 int32_t m_nPageIndex; 161 int32_t m_nPageIndex;
160 FX_BOOL m_bLoaded; 162 FX_BOOL m_bLoaded;
161 CFX_RectF m_rtPage; 163 CFX_RectF m_rtPage;
162 CFX_RectF m_rtPageMargin; 164 CFX_RectF m_rtPageMargin;
163 CFX_RectF m_rtPageContents; 165 CFX_RectF m_rtPageContents;
164 CFX_RectF m_rtPageCanvas; 166 CFX_RectF m_rtPageCanvas;
165 int32_t* m_pCharWidth; 167 int32_t* m_pCharWidth;
166 }; 168 };
167 169
168 #endif // XFA_FEE_FDE_TXTEDTPAGE_H_ 170 #endif // XFA_FEE_FDE_TXTEDTPAGE_H_
OLDNEW
« no previous file with comments | « xfa/fee/fde_txtedtengine.cpp ('k') | xfa/fee/fde_txtedtpage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698