Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(600)

Side by Side Diff: core/src/fpdfdoc/doc_link.cpp

Issue 1090693002: Replace FX_NEW with new, remove tests in fpdfdoc. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../include/fpdfdoc/fpdf_doc.h" 7 #include "../../include/fpdfdoc/fpdf_doc.h"
8 #include "../../src/fxcrt/fx_safe_types.h" 8 #include "../../src/fxcrt/fx_safe_types.h"
9 9
10 CPDF_LinkList::~CPDF_LinkList() 10 CPDF_LinkList::~CPDF_LinkList()
11 { 11 {
12 FX_POSITION pos = m_PageMap.GetStartPosition(); 12 FX_POSITION pos = m_PageMap.GetStartPosition();
13 while (pos) { 13 while (pos) {
14 FX_LPVOID key, value; 14 FX_LPVOID key, value;
15 m_PageMap.GetNextAssoc(pos, key, value); 15 m_PageMap.GetNextAssoc(pos, key, value);
16 delete (CFX_PtrArray*)value; 16 delete (CFX_PtrArray*)value;
17 } 17 }
18 } 18 }
19 CFX_PtrArray* CPDF_LinkList::GetPageLinks(CPDF_Page* pPage) 19 CFX_PtrArray* CPDF_LinkList::GetPageLinks(CPDF_Page* pPage)
20 { 20 {
21 FX_DWORD objnum = pPage->m_pFormDict->GetObjNum(); 21 FX_DWORD objnum = pPage->m_pFormDict->GetObjNum();
22 if (objnum == 0) { 22 if (objnum == 0) {
23 return NULL; 23 return NULL;
24 } 24 }
25 CFX_PtrArray* pPageLinkList = NULL; 25 CFX_PtrArray* pPageLinkList = NULL;
26 if (!m_PageMap.Lookup((FX_LPVOID)(FX_UINTPTR)objnum, (FX_LPVOID&)pPageLinkLi st)) { 26 if (!m_PageMap.Lookup((FX_LPVOID)(FX_UINTPTR)objnum, (FX_LPVOID&)pPageLinkLi st)) {
27 pPageLinkList = FX_NEW CFX_PtrArray; 27 pPageLinkList = new CFX_PtrArray;
28 if (pPageLinkList == NULL) {
29 return NULL;
30 }
31 m_PageMap.SetAt((FX_LPVOID)(FX_UINTPTR)objnum, pPageLinkList); 28 m_PageMap.SetAt((FX_LPVOID)(FX_UINTPTR)objnum, pPageLinkList);
32 LoadPageLinks(pPage, pPageLinkList); 29 LoadPageLinks(pPage, pPageLinkList);
33 } 30 }
34 return pPageLinkList; 31 return pPageLinkList;
35 } 32 }
36 int CPDF_LinkList::CountLinks(CPDF_Page* pPage) 33 int CPDF_LinkList::CountLinks(CPDF_Page* pPage)
37 { 34 {
38 CFX_PtrArray* pPageLinkList = GetPageLinks(pPage); 35 CFX_PtrArray* pPageLinkList = GetPageLinks(pPage);
39 if (pPageLinkList == NULL) { 36 if (pPageLinkList == NULL) {
40 return 0; 37 return 0;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 96 }
100 if (pDest->GetType() == PDFOBJ_ARRAY) { 97 if (pDest->GetType() == PDFOBJ_ARRAY) {
101 return CPDF_Dest((CPDF_Array*)pDest); 98 return CPDF_Dest((CPDF_Array*)pDest);
102 } 99 }
103 return CPDF_Dest(); 100 return CPDF_Dest();
104 } 101 }
105 CPDF_Action CPDF_Link::GetAction() 102 CPDF_Action CPDF_Link::GetAction()
106 { 103 {
107 return CPDF_Action(m_pDict->GetDict("A")); 104 return CPDF_Action(m_pDict->GetDict("A"));
108 } 105 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698