diff options
author | tsepez <tsepez@chromium.org> | 2016-08-26 10:59:04 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-26 10:59:04 -0700 |
commit | 80f9957fe156bd8e940499491ca8167fe7dad416 (patch) | |
tree | b0c46221fdfc40450d89fd4c55e646bdbc9bc13d /core/fpdfapi/fpdf_page | |
parent | 2d396ac157bcd6da78190def936e5eaf278a6ca7 (diff) | |
download | pdfium-80f9957fe156bd8e940499491ca8167fe7dad416.tar.xz |
Rework CFX_CountRef in terms of CFX_RetainPtr.
Make use of existing ref count work rather than re-inventing it.
Review-Url: https://codereview.chromium.org/2281683002
Diffstat (limited to 'core/fpdfapi/fpdf_page')
-rw-r--r-- | core/fpdfapi/fpdf_page/cpdf_colorstate.h | 1 | ||||
-rw-r--r-- | core/fpdfapi/fpdf_page/cpdf_contentmark.h | 1 | ||||
-rw-r--r-- | core/fpdfapi/fpdf_page/include/cpdf_path.h | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.h b/core/fpdfapi/fpdf_page/cpdf_colorstate.h index da4c49d3c9..c7b8854be4 100644 --- a/core/fpdfapi/fpdf_page/cpdf_colorstate.h +++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.h @@ -8,6 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_ #include "core/fpdfapi/fpdf_page/cpdf_colorstatedata.h" +#include "core/fxcrt/include/cfx_count_ref.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxcrt/include/fx_system.h" diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmark.h b/core/fpdfapi/fpdf_page/cpdf_contentmark.h index 056edc23a8..680aed4b99 100644 --- a/core/fpdfapi/fpdf_page/cpdf_contentmark.h +++ b/core/fpdfapi/fpdf_page/cpdf_contentmark.h @@ -8,6 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARK_H_ #include "core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h" +#include "core/fxcrt/include/cfx_count_ref.h" #include "core/fxcrt/include/fx_basic.h" class CPDF_ContentMark : public CFX_CountRef<CPDF_ContentMarkData> { diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h index 0c077bb443..0e8c491f9e 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_path.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h @@ -27,8 +27,8 @@ class CPDF_Path : public CFX_CountRef<CFX_PathData> { FX_BOOL IsRect() const { return m_pObject->IsRect(); } void Transform(const CFX_Matrix* pMatrix) { GetModify()->Transform(pMatrix); } - void Append(CPDF_Path src, const CFX_Matrix* pMatrix) { - m_pObject->Append(src.m_pObject, pMatrix); + void Append(const CPDF_Path& other, const CFX_Matrix* pMatrix) { + m_pObject->Append(other.GetObject(), pMatrix); } void AppendRect(FX_FLOAT left, |