Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Side by Side Diff: core/fpdfapi/parser/cpdf_string.cpp

Issue 2484033002: Return unique_ptr from CPDF_Object::Clone(). (Closed)
Patch Set: std::move() it Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/fpdfapi/parser/cpdf_string.h ('k') | core/fpdfdoc/cpdf_formfield.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/fpdfapi/parser/cpdf_string.h" 7 #include "core/fpdfapi/parser/cpdf_string.h"
8 8
9 #include "core/fpdfapi/parser/fpdf_parser_decode.h" 9 #include "core/fpdfapi/parser/fpdf_parser_decode.h"
10 #include "third_party/base/ptr_util.h"
10 11
11 CPDF_String::CPDF_String() : m_bHex(false) {} 12 CPDF_String::CPDF_String() : m_bHex(false) {}
12 13
13 CPDF_String::CPDF_String(const CFX_ByteString& str, bool bHex) 14 CPDF_String::CPDF_String(const CFX_ByteString& str, bool bHex)
14 : m_String(str), m_bHex(bHex) {} 15 : m_String(str), m_bHex(bHex) {}
15 16
16 CPDF_String::CPDF_String(const CFX_WideString& str) : m_bHex(false) { 17 CPDF_String::CPDF_String(const CFX_WideString& str) : m_bHex(false) {
17 m_String = PDF_EncodeText(str); 18 m_String = PDF_EncodeText(str);
18 } 19 }
19 20
20 CPDF_String::~CPDF_String() {} 21 CPDF_String::~CPDF_String() {}
21 22
22 CPDF_Object::Type CPDF_String::GetType() const { 23 CPDF_Object::Type CPDF_String::GetType() const {
23 return STRING; 24 return STRING;
24 } 25 }
25 26
26 CPDF_Object* CPDF_String::Clone() const { 27 std::unique_ptr<CPDF_Object> CPDF_String::Clone() const {
27 return new CPDF_String(m_String, m_bHex); 28 return pdfium::MakeUnique<CPDF_String>(m_String, m_bHex);
28 } 29 }
29 30
30 CFX_ByteString CPDF_String::GetString() const { 31 CFX_ByteString CPDF_String::GetString() const {
31 return m_String; 32 return m_String;
32 } 33 }
33 34
34 void CPDF_String::SetString(const CFX_ByteString& str) { 35 void CPDF_String::SetString(const CFX_ByteString& str) {
35 m_String = str; 36 m_String = str;
36 } 37 }
37 38
38 bool CPDF_String::IsString() const { 39 bool CPDF_String::IsString() const {
39 return true; 40 return true;
40 } 41 }
41 42
42 CPDF_String* CPDF_String::AsString() { 43 CPDF_String* CPDF_String::AsString() {
43 return this; 44 return this;
44 } 45 }
45 46
46 const CPDF_String* CPDF_String::AsString() const { 47 const CPDF_String* CPDF_String::AsString() const {
47 return this; 48 return this;
48 } 49 }
49 50
50 CFX_WideString CPDF_String::GetUnicodeText() const { 51 CFX_WideString CPDF_String::GetUnicodeText() const {
51 return PDF_DecodeText(m_String); 52 return PDF_DecodeText(m_String);
52 } 53 }
OLDNEW
« no previous file with comments | « core/fpdfapi/parser/cpdf_string.h ('k') | core/fpdfdoc/cpdf_formfield.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698