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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All Rights Reserved. 2 * Copyright (C) 2010 Google Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef HTMLMetaCharsetParser_h 26 #ifndef HTMLMetaCharsetParser_h
27 #define HTMLMetaCharsetParser_h 27 #define HTMLMetaCharsetParser_h
28 28
29 #include "core/html/parser/HTMLToken.h" 29 #include "core/html/parser/HTMLToken.h"
30 #include "platform/text/SegmentedString.h" 30 #include "platform/text/SegmentedString.h"
31 #include "wtf/Noncopyable.h" 31 #include "wtf/Noncopyable.h"
32 #include "wtf/PtrUtil.h"
32 #include "wtf/text/TextCodec.h" 33 #include "wtf/text/TextCodec.h"
33 #include "wtf/text/TextEncoding.h" 34 #include "wtf/text/TextEncoding.h"
35 #include <memory>
34 36
35 namespace blink { 37 namespace blink {
36 38
37 class HTMLTokenizer; 39 class HTMLTokenizer;
38 40
39 class HTMLMetaCharsetParser { 41 class HTMLMetaCharsetParser {
40 WTF_MAKE_NONCOPYABLE(HTMLMetaCharsetParser); USING_FAST_MALLOC(HTMLMetaChars etParser); 42 WTF_MAKE_NONCOPYABLE(HTMLMetaCharsetParser); USING_FAST_MALLOC(HTMLMetaChars etParser);
41 public: 43 public:
42 static PassOwnPtr<HTMLMetaCharsetParser> create() { return adoptPtr(new HTML MetaCharsetParser()); } 44 static std::unique_ptr<HTMLMetaCharsetParser> create() { return wrapUnique(n ew HTMLMetaCharsetParser()); }
43 45
44 ~HTMLMetaCharsetParser(); 46 ~HTMLMetaCharsetParser();
45 47
46 // Returns true if done checking, regardless whether an encoding is found. 48 // Returns true if done checking, regardless whether an encoding is found.
47 bool checkForMetaCharset(const char*, size_t); 49 bool checkForMetaCharset(const char*, size_t);
48 50
49 const WTF::TextEncoding& encoding() { return m_encoding; } 51 const WTF::TextEncoding& encoding() { return m_encoding; }
50 52
51 private: 53 private:
52 HTMLMetaCharsetParser(); 54 HTMLMetaCharsetParser();
53 55
54 bool processMeta(); 56 bool processMeta();
55 57
56 OwnPtr<HTMLTokenizer> m_tokenizer; 58 std::unique_ptr<HTMLTokenizer> m_tokenizer;
57 OwnPtr<TextCodec> m_assumedCodec; 59 std::unique_ptr<TextCodec> m_assumedCodec;
58 SegmentedString m_input; 60 SegmentedString m_input;
59 HTMLToken m_token; 61 HTMLToken m_token;
60 bool m_inHeadSection; 62 bool m_inHeadSection;
61 63
62 bool m_doneChecking; 64 bool m_doneChecking;
63 WTF::TextEncoding m_encoding; 65 WTF::TextEncoding m_encoding;
64 }; 66 };
65 67
66 } // namespace blink 68 } // namespace blink
67 #endif 69 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698