diff options
| author | tsepez <tsepez@chromium.org> | 2016-08-30 10:32:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-30 10:32:36 -0700 |
| commit | fbda17d61de1e02799f5d77dceb23df3688b764e (patch) | |
| tree | ad15940f6c9bf31ca390a711636981ecd0e52ff6 /core/fxcrt/include | |
| parent | f7252a074ed013e2ad3cc11e08eba90502262ce0 (diff) | |
| download | pdfium-fbda17d61de1e02799f5d77dceb23df3688b764e.tar.xz | |
Make CPDF_TextState have a CPDF_TextStateData rather than inheriting one.
Review-Url: https://codereview.chromium.org/2287313004
Diffstat (limited to 'core/fxcrt/include')
| -rw-r--r-- | core/fxcrt/include/cfx_count_ref.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fxcrt/include/cfx_count_ref.h b/core/fxcrt/include/cfx_count_ref.h index 954b72bf88..aac18b166a 100644 --- a/core/fxcrt/include/cfx_count_ref.h +++ b/core/fxcrt/include/cfx_count_ref.h @@ -18,7 +18,7 @@ class CFX_CountRef { ~CFX_CountRef() {} template <typename... Args> - ObjClass* New(Args... params) { + ObjClass* Emplace(Args... params) { m_pObject.Reset(new CountedObj(params...)); return m_pObject.Get(); } @@ -35,7 +35,7 @@ class CFX_CountRef { template <typename... Args> ObjClass* GetPrivateCopy(Args... params) { if (!m_pObject) - return New(params...); + return Emplace(params...); if (!m_pObject->HasOneRef()) m_pObject.Reset(new CountedObj(*m_pObject)); return m_pObject.Get(); |