From ec24b2e338de2a6211723f19f54386c950ac5010 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 2 Jan 2018 12:13:05 -0500 Subject: Make SharedCopyOnWrite use Retainables This CL removes the CountedObject from SharedCopyOnWrite and instead converts the items being shared into Retainable subclasses. BUG: chromium:792372 Change-Id: I9570a521f2fc2434013c3ccb103273bdd2440bb8 Reviewed-on: https://pdfium-review.googlesource.com/22010 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fxge/cfx_graphstatedata.h | 5 +++-- core/fxge/cfx_pathdata.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/cfx_graphstatedata.h b/core/fxge/cfx_graphstatedata.h index dc0098be3e..1afff83c1c 100644 --- a/core/fxge/cfx_graphstatedata.h +++ b/core/fxge/cfx_graphstatedata.h @@ -8,14 +8,15 @@ #define CORE_FXGE_CFX_GRAPHSTATEDATA_H_ #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/retain_ptr.h" -class CFX_GraphStateData { +class CFX_GraphStateData : public Retainable { public: enum LineCap { LineCapButt = 0, LineCapRound = 1, LineCapSquare = 2 }; CFX_GraphStateData(); CFX_GraphStateData(const CFX_GraphStateData& src); - ~CFX_GraphStateData(); + ~CFX_GraphStateData() override; void Copy(const CFX_GraphStateData& src); void SetDashCount(int count); diff --git a/core/fxge/cfx_pathdata.h b/core/fxge/cfx_pathdata.h index 0e2bb89f9f..d346ba0666 100644 --- a/core/fxge/cfx_pathdata.h +++ b/core/fxge/cfx_pathdata.h @@ -29,11 +29,11 @@ class FX_PATHPOINT { bool m_CloseFigure; }; -class CFX_PathData { +class CFX_PathData : public Retainable { public: CFX_PathData(); CFX_PathData(const CFX_PathData& src); - ~CFX_PathData(); + ~CFX_PathData() override; void Clear(); -- cgit v1.2.3