diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-30 01:53:50 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-30 01:53:50 -0700 |
| commit | d78704258f04d947d4f5fc2a7f8b44b57d456597 (patch) | |
| tree | b6561f688e88f00b437eba6128c1b5129d813a7e | |
| parent | 9dd9439d23d44d105db0950e33af0cc913a6cece (diff) | |
| download | pdfium-d78704258f04d947d4f5fc2a7f8b44b57d456597.tar.xz | |
Revert "Fix incorrect CPDFSDK_PageView::CountAnnots()."
This reverts commit 9dd9439d23d44d105db0950e33af0cc913a6cece.
BUG=536967
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1421583005 .
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/fsdk_mgr.cpp | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 2c063ed5a8..fa2860aa00 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -308,7 +308,7 @@ class CPDFSDK_PageView final { CPDFSDK_Annot* AddAnnot(const FX_CHAR* lpSubType, CPDF_Dictionary* pDict); CPDFSDK_Annot* AddAnnot(CPDF_Annot* pPDFAnnot); FX_BOOL DeleteAnnot(CPDFSDK_Annot* pAnnot); - size_t CountAnnots() const; + int CountAnnots() const; CPDFSDK_Annot* GetAnnot(size_t nIndex); CPDFSDK_Annot* GetAnnotByDict(CPDF_Dictionary* pDict); CPDF_Page* GetPDFPage() { return m_page; } diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index dfd39541fc..53a774edcd 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -664,7 +664,8 @@ void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice, CPDF_Annot* CPDFSDK_PageView::GetPDFAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY) { - for (size_t i = 0; i < CountAnnots(); ++i) { + int nCount = CountAnnots(); + for (int i = 0; i < nCount; i++) { CPDF_Annot* pAnnot = m_pAnnotList->GetAt(i); CFX_FloatRect annotRect; pAnnot->GetRect(annotRect); @@ -676,7 +677,8 @@ CPDF_Annot* CPDFSDK_PageView::GetPDFAnnotAtPoint(FX_FLOAT pageX, CPDF_Annot* CPDFSDK_PageView::GetPDFWidgetAtPoint(FX_FLOAT pageX, FX_FLOAT pageY) { - for (size_t i = 0; i < CountAnnots(); ++i) { + int nCount = CountAnnots(); + for (int i = 0; i < nCount; ++i) { CPDF_Annot* pAnnot = m_pAnnotList->GetAt(i); if (pAnnot->GetSubType() == "Widget") { CFX_FloatRect annotRect; @@ -762,8 +764,8 @@ CPDF_Document* CPDFSDK_PageView::GetPDFDocument() { return NULL; } -size_t CPDFSDK_PageView::CountAnnots() const { - return m_fxAnnotArray.size(); +int CPDFSDK_PageView::CountAnnots() const { + return m_pAnnotList->Count(); } CPDFSDK_Annot* CPDFSDK_PageView::GetAnnot(size_t nIndex) { @@ -897,8 +899,9 @@ void CPDFSDK_PageView::LoadFXAnnots() { CPDF_InterForm::EnableUpdateAP(FALSE); m_pAnnotList.reset(new CPDF_AnnotList(m_page)); CPDF_InterForm::EnableUpdateAP(enableAPUpdate); + int nCount = CountAnnots(); SetLock(TRUE); - for (size_t i = 0; i < CountAnnots(); ++i) { + for (int i = 0; i < nCount; ++i) { CPDF_Annot* pPDFAnnot = m_pAnnotList->GetAt(i); CPDF_Document* pDoc = GetPDFDocument(); @@ -949,7 +952,8 @@ FX_BOOL CPDFSDK_PageView::IsValidAnnot(CPDF_Annot* p) const { if (!p) return FALSE; - for (size_t i = 0; i < CountAnnots(); ++i) { + int nCount = CountAnnots(); + for (int i = 0; i < nCount; ++i) { if (m_pAnnotList->GetAt(i) == p) return TRUE; } |