diff options
| author | weili <weili@chromium.org> | 2016-07-21 12:26:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-07-21 12:26:18 -0700 |
| commit | 9ca2b09126b80c03655f0eee1f02e1b2d0a18230 (patch) | |
| tree | 4bb8fff9cdb6aa9bdc03687f3fb696cfaac8296c /fpdfsdk/fsdk_annothandler.cpp | |
| parent | a89f6be04bebbbf01686db167446df081a7042e0 (diff) | |
| download | pdfium-9ca2b09126b80c03655f0eee1f02e1b2d0a18230.tar.xz | |
Remove the use of handler array in CPDFSDK_AnnotHandlerMgr
Use map to store and manage the handlers directly instead of needing
an extra array.
Review-Url: https://codereview.chromium.org/2166953005
Diffstat (limited to 'fpdfsdk/fsdk_annothandler.cpp')
| -rw-r--r-- | fpdfsdk/fsdk_annothandler.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/fpdfsdk/fsdk_annothandler.cpp b/fpdfsdk/fsdk_annothandler.cpp index 2185562668..f7dd531f35 100644 --- a/fpdfsdk/fsdk_annothandler.cpp +++ b/fpdfsdk/fsdk_annothandler.cpp @@ -40,32 +40,18 @@ CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp) { #endif // PDF_ENABLE_XFA } -CPDFSDK_AnnotHandlerMgr::~CPDFSDK_AnnotHandlerMgr() { - for (int i = 0; i < m_Handlers.GetSize(); i++) { - IPDFSDK_AnnotHandler* pHandler = m_Handlers.GetAt(i); - delete pHandler; - } - m_Handlers.RemoveAll(); - m_mapType2Handler.clear(); -} +CPDFSDK_AnnotHandlerMgr::~CPDFSDK_AnnotHandlerMgr() {} void CPDFSDK_AnnotHandlerMgr::RegisterAnnotHandler( IPDFSDK_AnnotHandler* pAnnotHandler) { ASSERT(!GetAnnotHandler(pAnnotHandler->GetType())); - m_Handlers.Add(pAnnotHandler); - m_mapType2Handler[pAnnotHandler->GetType()] = pAnnotHandler; + m_mapType2Handler[pAnnotHandler->GetType()].reset(pAnnotHandler); } void CPDFSDK_AnnotHandlerMgr::UnRegisterAnnotHandler( IPDFSDK_AnnotHandler* pAnnotHandler) { m_mapType2Handler.erase(pAnnotHandler->GetType()); - for (int i = 0, sz = m_Handlers.GetSize(); i < sz; i++) { - if (m_Handlers.GetAt(i) == pAnnotHandler) { - m_Handlers.RemoveAt(i); - break; - } - } } CPDFSDK_Annot* CPDFSDK_AnnotHandlerMgr::NewAnnot(CPDF_Annot* pAnnot, @@ -139,7 +125,7 @@ IPDFSDK_AnnotHandler* CPDFSDK_AnnotHandlerMgr::GetAnnotHandler( IPDFSDK_AnnotHandler* CPDFSDK_AnnotHandlerMgr::GetAnnotHandler( const CFX_ByteString& sType) const { auto it = m_mapType2Handler.find(sType); - return it != m_mapType2Handler.end() ? it->second : nullptr; + return it != m_mapType2Handler.end() ? it->second.get() : nullptr; } void CPDFSDK_AnnotHandlerMgr::Annot_OnDraw(CPDFSDK_PageView* pPageView, |