diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-05-25 22:38:49 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-25 22:38:49 +0000 |
| commit | 2aa4b2f3928ccd8393f60db8f7b740c75f4e8a8d (patch) | |
| tree | 3c31b98ac48d5bb95c782cfe3c754037e66119d9 /core/fpdfapi/parser | |
| parent | b1ec280837cc6e1932754ef40de26d12b77aa910 (diff) | |
| download | pdfium-2aa4b2f3928ccd8393f60db8f7b740c75f4e8a8d.tar.xz | |
Make CPDF_Page retainable.
Small step to reducing the differences between XFA and non-XFA. We
still use the RetainPtr pretty much as if it were an unique_ptr, in
that we're not yet caching pages and handing out multiple pointers
to the same page in the non-XFA case.
The one change is in page view cleanup, where we no longer need a
boolean and can take (sufficient) page ownership with a RetainPtr.
Tidy up some document.h -> page.h -> document.h circular inclusion
while we're at it.
NOTE: Wait for imminent branch to pass before landing. We'll want
this to bake a while.
Change-Id: I64a2f12ac3424ece1063d40583995b834117cf34
Reviewed-on: https://pdfium-review.googlesource.com/32790
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_document.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h index 356d341302..013eded765 100644 --- a/core/fpdfapi/parser/cpdf_document.h +++ b/core/fpdfapi/parser/cpdf_document.h @@ -14,6 +14,7 @@ #include <vector> #include "core/fpdfapi/page/cpdf_image.h" +#include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfdoc/cpdf_linklist.h" @@ -165,7 +166,7 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { std::unique_ptr<CPDF_DocRenderData> m_pDocRender; std::unique_ptr<JBig2_DocumentContext> m_pCodecContext; std::unique_ptr<CPDF_LinkList> m_pLinksContext; - std::vector<uint32_t> m_PageList; + std::vector<uint32_t> m_PageList; // Page number to page's dict objnum. UnownedPtr<Extension> m_pExtension; }; |