Remove uncalled IFXA_WidgetIterator::Reset() and its overrides. Inline only call into constructor. Change-Id: I1f6aa4ea5ee063415e9be852a0cf32e441bce03b Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/79518 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp index 5133871..bed3360 100644 --- a/xfa/fxfa/cxfa_ffpageview.cpp +++ b/xfa/fxfa/cxfa_ffpageview.cpp
@@ -290,10 +290,6 @@ CXFA_FFPageWidgetIterator::~CXFA_FFPageWidgetIterator() = default; -void CXFA_FFPageWidgetIterator::Reset() { - m_sIterator.Reset(); -} - CXFA_FFWidget* CXFA_FFPageWidgetIterator::MoveToFirst() { m_sIterator.Reset(); for (CXFA_LayoutItem* pLayoutItem = m_sIterator.GetCurrent(); pLayoutItem; @@ -348,7 +344,7 @@ : m_pPageViewLayout(pPageView->GetLayoutItem()), m_dwFilter(dwFilter), m_bIgnoreRelevant(IsDocVersionBelow205(GetDocForPageView(pPageView))) { - Reset(); + CreateTabOrderWidgetArray(); } CXFA_FFTabOrderPageWidgetIterator::~CXFA_FFTabOrderPageWidgetIterator() = @@ -359,11 +355,6 @@ ContainerTrace(visitor, m_TabOrderWidgetArray); } -void CXFA_FFTabOrderPageWidgetIterator::Reset() { - CreateTabOrderWidgetArray(); - m_iCurWidget = -1; -} - CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToFirst() { for (int32_t i = 0; i < pdfium::CollectionSize<int32_t>(m_TabOrderWidgetArray); i++) {
diff --git a/xfa/fxfa/cxfa_ffpageview.h b/xfa/fxfa/cxfa_ffpageview.h index cd0baac..c8488a1 100644 --- a/xfa/fxfa/cxfa_ffpageview.h +++ b/xfa/fxfa/cxfa_ffpageview.h
@@ -57,7 +57,7 @@ void Trace(cppgc::Visitor* visitor) const {} - void Reset() override; + // IXFA_WidgetIterator: CXFA_FFWidget* MoveToFirst() override; CXFA_FFWidget* MoveToLast() override; CXFA_FFWidget* MoveToNext() override; @@ -82,7 +82,7 @@ void Trace(cppgc::Visitor* visitor) const; - void Reset() override; + // IXFA_WidgetIterator: CXFA_FFWidget* MoveToFirst() override; CXFA_FFWidget* MoveToLast() override; CXFA_FFWidget* MoveToNext() override;
diff --git a/xfa/fxfa/fxfa.h b/xfa/fxfa/fxfa.h index b0b25ee..ae21363 100644 --- a/xfa/fxfa/fxfa.h +++ b/xfa/fxfa/fxfa.h
@@ -257,7 +257,6 @@ public: virtual ~IXFA_WidgetIterator() = default; - virtual void Reset() = 0; virtual CXFA_FFWidget* MoveToFirst() = 0; virtual CXFA_FFWidget* MoveToLast() = 0; virtual CXFA_FFWidget* MoveToNext() = 0;