summaryrefslogtreecommitdiff
path: root/xfa/fxfa/app
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-05-16 13:21:03 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-16 13:21:03 -0700
commitcc4d6d85b58a7a1d9d7b798c63d3343f3dac06a9 (patch)
treefda580a573f97d15c9484c57ebf8fae66342ab83 /xfa/fxfa/app
parente699c66433049396e438d983a1837b9d4a4cf766 (diff)
downloadpdfium-cc4d6d85b58a7a1d9d7b798c63d3343f3dac06a9.tar.xz
Remove { delete this; } anti-pattern from IXFA_WidgetIterator
Review-Url: https://codereview.chromium.org/1976123003
Diffstat (limited to 'xfa/fxfa/app')
-rw-r--r--xfa/fxfa/app/xfa_ffpageview.cpp6
-rw-r--r--xfa/fxfa/app/xfa_rendercontext.cpp6
2 files changed, 5 insertions, 7 deletions
diff --git a/xfa/fxfa/app/xfa_ffpageview.cpp b/xfa/fxfa/app/xfa_ffpageview.cpp
index f1898c83f1..e5a05734dc 100644
--- a/xfa/fxfa/app/xfa_ffpageview.cpp
+++ b/xfa/fxfa/app/xfa_ffpageview.cpp
@@ -197,6 +197,7 @@ CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetWidget(
}
return NULL;
}
+
CXFA_FFTabOrderPageWidgetIterator::CXFA_FFTabOrderPageWidgetIterator(
CXFA_FFPageView* pPageView,
uint32_t dwFilter)
@@ -206,10 +207,9 @@ CXFA_FFTabOrderPageWidgetIterator::CXFA_FFTabOrderPageWidgetIterator(
->GetCurVersionMode() < XFA_VERSION_205;
Reset();
}
+
CXFA_FFTabOrderPageWidgetIterator::~CXFA_FFTabOrderPageWidgetIterator() {}
-void CXFA_FFTabOrderPageWidgetIterator::Release() {
- delete this;
-}
+
void CXFA_FFTabOrderPageWidgetIterator::Reset() {
CreateTabOrderWidgetArray();
m_iCurWidget = -1;
diff --git a/xfa/fxfa/app/xfa_rendercontext.cpp b/xfa/fxfa/app/xfa_rendercontext.cpp
index cc2ea4b9ac..e7bacec281 100644
--- a/xfa/fxfa/app/xfa_rendercontext.cpp
+++ b/xfa/fxfa/app/xfa_rendercontext.cpp
@@ -68,8 +68,6 @@ int32_t CXFA_RenderContext::DoRender(IFX_Pause* pPause) {
return XFA_RENDERSTATUS_Done;
}
void CXFA_RenderContext::StopRender() {
- if (m_pWidgetIterator) {
- m_pWidgetIterator->Release();
- m_pWidgetIterator = NULL;
- }
+ delete m_pWidgetIterator;
+ m_pWidgetIterator = nullptr;
}