third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.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/core/loader/TextResourceDecoderBuilder.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.h ('k') | third_party/WebKit/Source/core/loader/TextResourceDecoderBuilderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp

diff --git a/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp b/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp

index 86189fbc0778d9723e61b55c0087f4d699f73e3f..655aa285a143d3f956a04a7d786415c13c75b3ec 100644

--- a/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp

+++ b/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp

@@ -34,7 +34,6 @@

#include "core/frame/LocalFrame.h"

#include "core/frame/Settings.h"

#include "platform/weborigin/SecurityOrigin.h"

-#include <memory>

namespace blink {

@@ -129,7 +128,7 @@ TextResourceDecoderBuilder::~TextResourceDecoderBuilder()

}

-inline std::unique_ptr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoderInstance(Document* document)

+inline PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoderInstance(Document* document)

{

const WTF::TextEncoding encodingFromDomain = getEncodingFromDomain(document->url());

if (LocalFrame* frame = document->frame()) {

@@ -168,9 +167,9 @@ inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod

}

-std::unique_ptr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* document)

+PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* document)

{

- std::unique_ptr<TextResourceDecoder> decoder = createDecoderInstance(document);

+ OwnPtr<TextResourceDecoder> decoder = createDecoderInstance(document);

setupEncoding(decoder.get(), document);

return decoder;

}