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

Unified Diff: third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h

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
Index: third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h b/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h
index 35837bdadf9e1224605cb467d543a8f539f12078..18796f83034132f99cc072e7e17bbeae52ce16af 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h
+++ b/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h
@@ -29,10 +29,8 @@
#include "core/html/parser/HTMLToken.h"
#include "platform/text/SegmentedString.h"
#include "wtf/Noncopyable.h"
-#include "wtf/PtrUtil.h"
#include "wtf/text/TextCodec.h"
#include "wtf/text/TextEncoding.h"
-#include <memory>
namespace blink {
@@ -41,7 +39,7 @@ class HTMLTokenizer;
class HTMLMetaCharsetParser {
WTF_MAKE_NONCOPYABLE(HTMLMetaCharsetParser); USING_FAST_MALLOC(HTMLMetaCharsetParser);
public:
- static std::unique_ptr<HTMLMetaCharsetParser> create() { return wrapUnique(new HTMLMetaCharsetParser()); }
+ static PassOwnPtr<HTMLMetaCharsetParser> create() { return adoptPtr(new HTMLMetaCharsetParser()); }
~HTMLMetaCharsetParser();
@@ -55,8 +53,8 @@ private:
bool processMeta();
- std::unique_ptr<HTMLTokenizer> m_tokenizer;
- std::unique_ptr<TextCodec> m_assumedCodec;
+ OwnPtr<HTMLTokenizer> m_tokenizer;
+ OwnPtr<TextCodec> m_assumedCodec;
SegmentedString m_input;
HTMLToken m_token;
bool m_inHeadSection;

Powered by Google App Engine
This is Rietveld 408576698