summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-04-19 16:07:21 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-04-19 21:23:25 +0000
commit3c66ea01f5239a7b1a0da75285e0c8048e5cf784 (patch)
tree691729ad6f8924f2fc70dc31f01fafbfdb7ce8a4 /xfa
parent4363c8ff37b6e6a98fffe53fff248e61d04f697a (diff)
downloadpdfium-3c66ea01f5239a7b1a0da75285e0c8048e5cf784.tar.xz
Update IFX_CharIter::Clone to return unique_ptr
This Cl converts the Clone method of IFX_CharIter to return a unique_ptr. The usages were all converting to a unique_ptr already. Change-Id: I1ca5ddd03eca8f21d616efb2b92fb27899c43c23 Reviewed-on: https://pdfium-review.googlesource.com/4351 Reviewed-by: Nicolás Peña <npm@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fde/cfde_txtedtbuf.cpp4
-rw-r--r--xfa/fde/cfde_txtedtbuf.h2
-rw-r--r--xfa/fde/cfde_txtedtpage.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fde/cfde_txtedtbuf.cpp b/xfa/fde/cfde_txtedtbuf.cpp
index dc88704a6c..1ec3c9721a 100644
--- a/xfa/fde/cfde_txtedtbuf.cpp
+++ b/xfa/fde/cfde_txtedtbuf.cpp
@@ -343,8 +343,8 @@ bool CFDE_TxtEdtBuf::Iterator::IsEOF(bool bTail) const {
return bTail ? m_nIndex == (m_pBuf->GetTextLength() - 2) : m_nIndex == 0;
}
-IFX_CharIter* CFDE_TxtEdtBuf::Iterator::Clone() {
- CFDE_TxtEdtBuf::Iterator* pIter = new CFDE_TxtEdtBuf::Iterator(m_pBuf);
+std::unique_ptr<IFX_CharIter> CFDE_TxtEdtBuf::Iterator::Clone() {
+ auto pIter = pdfium::MakeUnique<CFDE_TxtEdtBuf::Iterator>(m_pBuf);
pIter->m_nCurChunk = m_nCurChunk;
pIter->m_nCurIndex = m_nCurIndex;
pIter->m_nIndex = m_nIndex;
diff --git a/xfa/fde/cfde_txtedtbuf.h b/xfa/fde/cfde_txtedtbuf.h
index 650d375bf8..096ce6bf77 100644
--- a/xfa/fde/cfde_txtedtbuf.h
+++ b/xfa/fde/cfde_txtedtbuf.h
@@ -31,7 +31,7 @@ class CFDE_TxtEdtBuf {
int32_t GetAt() const override;
bool IsEOF(bool bTail = true) const override;
- IFX_CharIter* Clone() override;
+ std::unique_ptr<IFX_CharIter> Clone() override;
private:
CFDE_TxtEdtBuf* m_pBuf;
diff --git a/xfa/fde/cfde_txtedtpage.cpp b/xfa/fde/cfde_txtedtpage.cpp
index faf52316c8..f0b03af7ca 100644
--- a/xfa/fde/cfde_txtedtpage.cpp
+++ b/xfa/fde/cfde_txtedtpage.cpp
@@ -279,7 +279,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(const CFX_RectF* pClipBox,
m_nCharCount = nPageEnd - nPageStart + 1;
bool bReload = false;
float fDefCharWidth = 0;
- std::unique_ptr<IFX_CharIter> pIter(m_pIter->Clone());
+ std::unique_ptr<IFX_CharIter> pIter = m_pIter->Clone();
pIter->SetAt(nPageStart);
m_pIter->SetAt(nPageStart);
bool bFirstPiece = true;