third_party/WebKit/Source/wtf/text/TextEncoding.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/wtf/text/TextEncoding.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Source/wtf/text/TextEncoding.cpp

diff --git a/third_party/WebKit/Source/wtf/text/TextEncoding.cpp b/third_party/WebKit/Source/wtf/text/TextEncoding.cpp

index 31cdfb837a5e0ab2912ffeba39668483914622f4..f3f231d4680504cc21ee9ab25d0c0a813a9b1ee6 100644

--- a/third_party/WebKit/Source/wtf/text/TextEncoding.cpp

+++ b/third_party/WebKit/Source/wtf/text/TextEncoding.cpp

@@ -27,12 +27,12 @@

#include "wtf/text/TextEncoding.h"

+#include "wtf/OwnPtr.h"

#include "wtf/StdLibExtras.h"

#include "wtf/Threading.h"

#include "wtf/text/CString.h"

#include "wtf/text/TextEncodingRegistry.h"

#include "wtf/text/WTFString.h"

-#include <memory>

namespace WTF {

@@ -74,7 +74,7 @@ CString TextEncoding::encode(const String& string, UnencodableHandling handling)

if (string.isEmpty())

return "";

- std::unique_ptr<TextCodec> textCodec = newTextCodec(*this);

+ OwnPtr<TextCodec> textCodec = newTextCodec(*this);

CString encodedString;

if (string.is8Bit())

encodedString = textCodec->encode(string.characters8(), string.length(), handling);