diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-01-30 14:49:24 -0800 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-31 00:42:43 +0000 |
| commit | 51d02b341dd56f8e365444cb9e4af7e0ffe55ae5 (patch) | |
| tree | 616f11f803bc067eecc2c2c94684b3062a190221 /xfa/fxfa | |
| parent | 02d83e1f963f56f61de670161e12ffb131c56d7b (diff) | |
| download | pdfium-51d02b341dd56f8e365444cb9e4af7e0ffe55ae5.tar.xz | |
use std::vector in cfx_graphics.h and xfa_ffwidget.h
Change-Id: I19f2e729b58de42506e8fc2811dd06d406470314
Reviewed-on: https://pdfium-review.googlesource.com/2470
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffdocview.cpp | 11 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidget.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidgetacc.cpp | 5 | ||||
| -rw-r--r-- | xfa/fxfa/xfa_ffwidget.h | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp index bf91baf082..0aedeed231 100644 --- a/xfa/fxfa/app/xfa_ffdocview.cpp +++ b/xfa/fxfa/app/xfa_ffdocview.cpp @@ -636,11 +636,12 @@ void CXFA_FFDocView::AddCalculateWidgetAcc(CXFA_WidgetAcc* pWidgetAcc) { } void CXFA_FFDocView::AddCalculateNodeNotify(CXFA_Node* pNodeChange) { - CXFA_CalcData* pGlobalData = - (CXFA_CalcData*)pNodeChange->GetUserData(XFA_CalcData); - int32_t iCount = pGlobalData ? pGlobalData->m_Globals.GetSize() : 0; - for (int32_t i = 0; i < iCount; i++) { - CXFA_WidgetAcc* pResultAcc = pGlobalData->m_Globals[i]; + auto pGlobalData = + static_cast<CXFA_CalcData*>(pNodeChange->GetUserData(XFA_CalcData)); + if (!pGlobalData) + return; + + for (const auto& pResultAcc : pGlobalData->m_Globals) { if (!pResultAcc->GetNode()->HasRemovedChildren()) AddCalculateWidgetAcc(pResultAcc); } diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index c1822470e0..4cd6b44a66 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -2048,6 +2048,4 @@ void XFA_DrawBox(CXFA_Box box, CXFA_CalcData::CXFA_CalcData() : m_iRefCount(0) {} -CXFA_CalcData::~CXFA_CalcData() { - m_Globals.RemoveAll(); -} +CXFA_CalcData::~CXFA_CalcData() {} diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index d4d9949c3e..5fe591c02a 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp @@ -678,9 +678,8 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, pRefNode->SetUserData(XFA_CalcData, pGlobalData, &gs_XFADeleteCalcData); } - if (pGlobalData->m_Globals.Find(this) < 0) { - pGlobalData->m_Globals.Add(this); - } + if (!pdfium::ContainsValue(pGlobalData->m_Globals, this)) + pGlobalData->m_Globals.push_back(this); } } } diff --git a/xfa/fxfa/xfa_ffwidget.h b/xfa/fxfa/xfa_ffwidget.h index f4ef8ce97b..009cd44dc0 100644 --- a/xfa/fxfa/xfa_ffwidget.h +++ b/xfa/fxfa/xfa_ffwidget.h @@ -37,7 +37,7 @@ class CXFA_CalcData { CXFA_CalcData(); ~CXFA_CalcData(); - CFX_ArrayTemplate<CXFA_WidgetAcc*> m_Globals; + std::vector<CXFA_WidgetAcc*> m_Globals; int32_t m_iRefCount; }; |