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

Side by Side Diff: third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef TextResourceDecoderBuilder_h 31 #ifndef TextResourceDecoderBuilder_h
32 #define TextResourceDecoderBuilder_h 32 #define TextResourceDecoderBuilder_h
33 33
34 #include "core/html/parser/TextResourceDecoder.h" 34 #include "core/html/parser/TextResourceDecoder.h"
35 #include "wtf/Allocator.h" 35 #include "wtf/Allocator.h"
36 #include "wtf/PassRefPtr.h" 36 #include "wtf/PassRefPtr.h"
37 #include "wtf/text/WTFString.h" 37 #include "wtf/text/WTFString.h"
38 #include <memory>
38 39
39 namespace blink { 40 namespace blink {
40 41
41 class Document; 42 class Document;
42 class TextResourceDecoder; 43 class TextResourceDecoder;
43 44
44 class CORE_EXPORT TextResourceDecoderBuilder { 45 class CORE_EXPORT TextResourceDecoderBuilder {
45 DISALLOW_NEW(); 46 DISALLOW_NEW();
46 public: 47 public:
47 TextResourceDecoderBuilder(const AtomicString& mimeType, const AtomicString& encoding); 48 TextResourceDecoderBuilder(const AtomicString& mimeType, const AtomicString& encoding);
48 ~TextResourceDecoderBuilder(); 49 ~TextResourceDecoderBuilder();
49 50
50 PassOwnPtr<TextResourceDecoder> buildFor(Document*); 51 std::unique_ptr<TextResourceDecoder> buildFor(Document*);
51 52
52 const AtomicString& mimeType() const { return m_mimeType; } 53 const AtomicString& mimeType() const { return m_mimeType; }
53 const AtomicString& encoding() const { return m_encoding; } 54 const AtomicString& encoding() const { return m_encoding; }
54 55
55 void clear(); 56 void clear();
56 57
57 private: 58 private:
58 PassOwnPtr<TextResourceDecoder> createDecoderInstance(Document*); 59 std::unique_ptr<TextResourceDecoder> createDecoderInstance(Document*);
59 void setupEncoding(TextResourceDecoder*, Document*); 60 void setupEncoding(TextResourceDecoder*, Document*);
60 61
61 AtomicString m_mimeType; 62 AtomicString m_mimeType;
62 AtomicString m_encoding; 63 AtomicString m_encoding;
63 }; 64 };
64 65
65 } // namespace blink 66 } // namespace blink
66 67
67 #endif // TextResourceDecoderBuilder_h 68 #endif // TextResourceDecoderBuilder_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698