diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-17 16:38:51 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-17 16:38:51 -0700 |
| commit | ff8347a4b16f000be628c5e10d03a1e1c17537eb (patch) | |
| tree | 1d46e77a1ef6b28def6af3ffdd576017a6cfe229 /core/src/fpdftext/fpdf_text.cpp | |
| parent | c4d9f6ad2dc922b574862cd2f6f0a899d7e169e3 (diff) | |
| download | pdfium-ff8347a4b16f000be628c5e10d03a1e1c17537eb.tar.xz | |
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.
Diffstat (limited to 'core/src/fpdftext/fpdf_text.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 30934f6820..91d0e41b8d 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fpdfapi/fpdf_page.h" #include "../../include/fpdfapi/fpdf_pageobj.h" #include "../../include/fpdftext/fpdf_text.h" @@ -308,17 +309,14 @@ void NormalizeString(CFX_WideString& str) return; } CFX_WideString sBuffer; - IFX_BidiChar* BidiChar = IFX_BidiChar::Create(); - if (NULL == BidiChar) { - return; - } + nonstd::unique_ptr<IFX_BidiChar> pBidiChar(IFX_BidiChar::Create()); CFX_WordArray order; FX_BOOL bR2L = FALSE; int32_t start = 0, count = 0, i = 0; int nR2L = 0, nL2R = 0; for (i = 0; i < str.GetLength(); i++) { - if(BidiChar->AppendChar(str.GetAt(i))) { - int32_t ret = BidiChar->GetBidiInfo(start, count); + if(pBidiChar->AppendChar(str.GetAt(i))) { + int32_t ret = pBidiChar->GetBidiInfo(start, count); order.Add(start); order.Add(count); order.Add(ret); @@ -331,8 +329,8 @@ void NormalizeString(CFX_WideString& str) } } } - if(BidiChar->EndChar()) { - int32_t ret = BidiChar->GetBidiInfo(start, count); + if(pBidiChar->EndChar()) { + int32_t ret = pBidiChar->GetBidiInfo(start, count); order.Add(start); order.Add(count); order.Add(ret); @@ -428,7 +426,6 @@ void NormalizeString(CFX_WideString& str) } str.Empty(); str += sBuffer; - BidiChar->Release(); } static FX_BOOL IsNumber(CFX_WideString& str) { |