From ff8347a4b16f000be628c5e10d03a1e1c17537eb Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 17 Jun 2015 16:38:51 -0700 Subject: Replace some Release() calls with virtual destructors. A virtual method that does |delete this| is an anti-pattern. Some classes can be de-virtualized instead. Throw in some unique_ptrs and delete dead code for good measure. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1192013002. --- core/src/fxcrt/fx_arabic.cpp | 5 +++++ core/src/fxcrt/fx_arabic.h | 20 +++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'core/src/fxcrt') diff --git a/core/src/fxcrt/fx_arabic.cpp b/core/src/fxcrt/fx_arabic.cpp index 94b514bd0d..3cb2fd067a 100644 --- a/core/src/fxcrt/fx_arabic.cpp +++ b/core/src/fxcrt/fx_arabic.cpp @@ -22,6 +22,11 @@ CFX_BidiChar::CFX_BidiChar() , m_iLastCount(0) { } +void CFX_BidiChar::SetPolicy(FX_BOOL bSeparateNeutral) +{ + m_bSeparateNeutral = bSeparateNeutral; +} + FX_BOOL CFX_BidiChar::AppendChar(FX_WCHAR wch) { FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h index e7e6a28c43..e4c1ddacf2 100644 --- a/core/src/fxcrt/fx_arabic.h +++ b/core/src/fxcrt/fx_arabic.h @@ -13,21 +13,15 @@ class CFX_BidiChar final : public IFX_BidiChar { public: CFX_BidiChar(); - virtual void Release() override - { - delete this; - } - virtual void SetPolicy(FX_BOOL bSeparateNeutral = TRUE) override - { - m_bSeparateNeutral = bSeparateNeutral; - } - virtual FX_BOOL AppendChar(FX_WCHAR wch) override; - virtual FX_BOOL EndChar() override; - virtual int32_t GetBidiInfo(int32_t &iStart, int32_t &iCount) override; - virtual void Reset() override; + ~CFX_BidiChar() override {} + + void SetPolicy(FX_BOOL bSeparateNeutral = TRUE) override; + FX_BOOL AppendChar(FX_WCHAR wch) override; + FX_BOOL EndChar() override; + int32_t GetBidiInfo(int32_t &iStart, int32_t &iCount) override; + void Reset() override; private: - ~CFX_BidiChar() { } FX_BOOL m_bSeparateNeutral; int32_t m_iCurStart; int32_t m_iCurCount; -- cgit v1.2.3