summaryrefslogtreecommitdiff
path: root/xfa/fde/cfde_txtedtengine.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-08-21 15:21:05 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-23 15:46:39 +0000
commit6b0287d245995d04a2a9a44213b22fce9ca8c237 (patch)
tree0c278f27eaca99adc72cfad210a879649a55753e /xfa/fde/cfde_txtedtengine.h
parent12db7515f17228798d1aa38fce0fee3e7d2d36b6 (diff)
downloadpdfium-6b0287d245995d04a2a9a44213b22fce9ca8c237.tar.xz
Move m_pTextBreak to be a member of CFDE_TxtEdtEngine
Previously text break was a unique_ptr inside the CFDE_TxtEdtEngine. This CL converts it to be a member instead of a unique_ptr. We never replace the pointer after it's created. Change-Id: I89ab73e81c63c24abfacd38a1141db6473d77640 Reviewed-on: https://pdfium-review.googlesource.com/11530 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde/cfde_txtedtengine.h')
-rw-r--r--xfa/fde/cfde_txtedtengine.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fde/cfde_txtedtengine.h b/xfa/fde/cfde_txtedtengine.h
index b708984ac4..547cd57eae 100644
--- a/xfa/fde/cfde_txtedtengine.h
+++ b/xfa/fde/cfde_txtedtengine.h
@@ -16,10 +16,10 @@
#include "xfa/fde/cfde_txtedtbuf.h"
#include "xfa/fde/cfde_txtedtpage.h"
#include "xfa/fde/cfde_txtedtparag.h"
+#include "xfa/fgas/layout/cfx_txtbreak.h"
class CFGAS_GEFont;
class CFWL_Edit;
-class CFX_TxtBreak;
class IFDE_TxtEdtDoRecord;
class IFX_CharIter;
@@ -125,7 +125,7 @@ class CFDE_TxtEdtEngine {
}
CFDE_TxtEdtBuf* GetTextBuf() const { return m_pTxtBuf.get(); }
- CFX_TxtBreak* GetTextBreak() const { return m_pTextBreak.get(); }
+ CFX_TxtBreak* GetTextBreak() { return &m_TextBreak; }
int32_t GetLineCount() const { return m_nLineCount; }
int32_t GetPageLineCount() const { return m_nPageLineCount; }
@@ -205,7 +205,7 @@ class CFDE_TxtEdtEngine {
void DeleteSelect();
std::unique_ptr<CFDE_TxtEdtBuf> m_pTxtBuf;
- std::unique_ptr<CFX_TxtBreak> m_pTextBreak;
+ CFX_TxtBreak m_TextBreak;
FDE_TXTEDTPARAMS m_Param;
std::vector<std::unique_ptr<CFDE_TxtEdtPage>> m_PagePtrArray;
std::vector<std::unique_ptr<CFDE_TxtEdtParag>> m_ParagPtrArray;