diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-20 10:58:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-20 10:58:52 -0700 |
| commit | 7403f8a2a0d87179a1ccd57ceccd2d84fa59c319 (patch) | |
| tree | c50f211d8efca99e9ec17733a776fca854c3f78c /core/fpdfapi/parser/cpdf_document.h | |
| parent | 05259e98f7416b59da18ee6059b48a23fddca8af (diff) | |
| download | pdfium-7403f8a2a0d87179a1ccd57ceccd2d84fa59c319.tar.xz | |
Revert of Traverse PDF page tree only once in CPDF_Document (patchset #4 id:60001 of https://codereview.chromium.org/2414423002/ )
Reason for revert:
Possible cause of crbug.com/657897 reverting to find out.
BUG=657897
Original issue's description:
> Traverse PDF page tree only once in CPDF_Document
>
> In our current implementation of CPDF_Document::GetPage, we traverse
> the PDF page tree until we find the index we are looking for. This is
> slow when we do calls GetPage(0), GetPage(1), ... since in this case
> the page tree will be traversed n times if there are n pages. This CL
> makes sure the page tree is only traversed once.
>
> Time to load the PDF from the bug below in chrome official build:
> Before this CL: 1 minute 40 seconds
> After this CL: 5 seconds
>
> BUG=chromium:638513
>
> Committed: https://pdfium.googlesource.com/pdfium/+/7c29e27dae139a205755c1a29b7f3ac8b36ec0da
TBR=thestig@chromium.org,tsepez@chromium.org,npm@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=chromium:638513
Review-Url: https://chromiumcodereview.appspot.com/2430313006
Diffstat (limited to 'core/fpdfapi/parser/cpdf_document.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_document.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h index e845ea8eef..c557a56013 100644 --- a/core/fpdfapi/parser/cpdf_document.h +++ b/core/fpdfapi/parser/cpdf_document.h @@ -9,7 +9,6 @@ #include <functional> #include <memory> -#include <stack> #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" #include "core/fpdfapi/parser/cpdf_object.h" @@ -108,7 +107,10 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { // Retrieve page count information by getting count value from the tree nodes int RetrievePageCount() const; - CPDF_Dictionary* TraversePDFPages(int iPage, int nPagesToGo); + CPDF_Dictionary* FindPDFPage(CPDF_Dictionary* pPages, + int iPage, + int nPagesToGo, + int level); int FindPageIndex(CPDF_Dictionary* pNode, uint32_t& skip_count, uint32_t objnum, @@ -124,19 +126,10 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { FX_BOOL bVert, CFX_ByteString basefont, std::function<void(FX_WCHAR, FX_WCHAR, CPDF_Array*)> Insert); - int InsertDeletePDFPage(CPDF_Dictionary* pPages, - int nPagesToGo, - CPDF_Dictionary* pPage, - FX_BOOL bInsert, - std::set<CPDF_Dictionary*>* pVisited); - int InsertNewPage(int iPage, - CPDF_Dictionary* pPageDict, - CFX_ArrayTemplate<uint32_t>& pageList); + std::unique_ptr<CPDF_Parser> m_pParser; CPDF_Dictionary* m_pRootDict; CPDF_Dictionary* m_pInfoDict; - std::stack<std::pair<CPDF_Dictionary*, int>> m_pTreeTraversal; - int m_iLastPageTraversed; bool m_bLinearized; int m_iFirstPageNo; uint32_t m_dwFirstPageObjNum; |