| Index: third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp b/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp
|
| index b0f5d56c262aae2e2d6306822553c60ceb1dc640..616dcdd188e1b2b9a0296a9c320da74d96c34607 100644
|
| --- a/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp
|
| @@ -28,6 +28,7 @@
|
| #include "core/dom/Document.h"
|
| #include "core/dom/DocumentEncodingData.h"
|
| #include "core/html/parser/TextResourceDecoder.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -41,7 +42,7 @@ DecodedDataDocumentParser::~DecodedDataDocumentParser()
|
| {
|
| }
|
|
|
| -void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decoder)
|
| +void DecodedDataDocumentParser::setDecoder(std::unique_ptr<TextResourceDecoder> decoder)
|
| {
|
| // If the decoder is explicitly unset rather than having ownership
|
| // transferred away by takeDecoder(), we need to make sure it's recreated
|
| @@ -55,7 +56,7 @@ TextResourceDecoder* DecodedDataDocumentParser::decoder()
|
| return m_decoder.get();
|
| }
|
|
|
| -PassOwnPtr<TextResourceDecoder> DecodedDataDocumentParser::takeDecoder()
|
| +std::unique_ptr<TextResourceDecoder> DecodedDataDocumentParser::takeDecoder()
|
| {
|
| return std::move(m_decoder);
|
| }
|
|
|