diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-07-05 15:39:59 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-05 15:39:59 +0000 |
| commit | 86b4f67d40c351ea8e67ba7b7dcc9d8dd7ad371e (patch) | |
| tree | 54881ef1ca024cd369862cff584b5fd434c1a183 /core/fpdfapi/page/cpdf_contentmark.h | |
| parent | d774a73b59ac36d533064041196d051c032eee6b (diff) | |
| download | pdfium-86b4f67d40c351ea8e67ba7b7dcc9d8dd7ad371e.tar.xz | |
Replace SharedCopyOnWrite<MarkData> with RetainPtr
A RetainPtr is already used inside SharedCopyOnWrite, and the API
that CPDF_ContentMark offers is not intuitive. AddMark() and
RemoveLastMark() currently copy the MarkData.
The new API does not perform these copies, but rather leaves it to
the client code.
This is the first step to make CPDF_ContentMarkItems modifiable. As
long as they are inside a SharedCopyOnWrite, they cannot be changed.
Bug: pdfium:1037
Change-Id: I0cd6334b0b8db62070b4412f1d6d1c88bce9891f
Reviewed-on: https://pdfium-review.googlesource.com/37132
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_contentmark.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_contentmark.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/fpdfapi/page/cpdf_contentmark.h b/core/fpdfapi/page/cpdf_contentmark.h index 494c20630b..241a0ffbf3 100644 --- a/core/fpdfapi/page/cpdf_contentmark.h +++ b/core/fpdfapi/page/cpdf_contentmark.h @@ -7,20 +7,21 @@ #ifndef CORE_FPDFAPI_PAGE_CPDF_CONTENTMARK_H_ #define CORE_FPDFAPI_PAGE_CPDF_CONTENTMARK_H_ +#include <memory> #include <vector> #include "core/fpdfapi/page/cpdf_contentmarkitem.h" #include "core/fxcrt/fx_system.h" -#include "core/fxcrt/shared_copy_on_write.h" +#include "core/fxcrt/retain_ptr.h" class CPDF_Dictionary; class CPDF_ContentMark { public: CPDF_ContentMark(); - CPDF_ContentMark(const CPDF_ContentMark& that); ~CPDF_ContentMark(); + std::unique_ptr<CPDF_ContentMark> Clone(); int GetMarkedContentID() const; size_t CountItems() const; const CPDF_ContentMarkItem& GetItem(size_t i) const; @@ -50,7 +51,7 @@ class CPDF_ContentMark { std::vector<CPDF_ContentMarkItem> m_Marks; }; - SharedCopyOnWrite<MarkData> m_Ref; + RetainPtr<MarkData> m_Ref; }; #endif // CORE_FPDFAPI_PAGE_CPDF_CONTENTMARK_H_ |