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

Side by Side Diff: third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.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 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>
39 38
40 namespace blink { 39 namespace blink {
41 40
42 class Document; 41 class Document;
43 class TextResourceDecoder; 42 class TextResourceDecoder;
44 43
45 class CORE_EXPORT TextResourceDecoderBuilder { 44 class CORE_EXPORT TextResourceDecoderBuilder {
46 DISALLOW_NEW(); 45 DISALLOW_NEW();
47 public: 46 public:
48 TextResourceDecoderBuilder(const AtomicString& mimeType, const AtomicString& encoding); 47 TextResourceDecoderBuilder(const AtomicString& mimeType, const AtomicString& encoding);
49 ~TextResourceDecoderBuilder(); 48 ~TextResourceDecoderBuilder();
50 49
51 std::unique_ptr<TextResourceDecoder> buildFor(Document*); 50 PassOwnPtr<TextResourceDecoder> buildFor(Document*);
52 51
53 const AtomicString& mimeType() const { return m_mimeType; } 52 const AtomicString& mimeType() const { return m_mimeType; }
54 const AtomicString& encoding() const { return m_encoding; } 53 const AtomicString& encoding() const { return m_encoding; }
55 54
56 void clear(); 55 void clear();
57 56
58 private: 57 private:
59 std::unique_ptr<TextResourceDecoder> createDecoderInstance(Document*); 58 PassOwnPtr<TextResourceDecoder> createDecoderInstance(Document*);
60 void setupEncoding(TextResourceDecoder*, Document*); 59 void setupEncoding(TextResourceDecoder*, Document*);
61 60
62 AtomicString m_mimeType; 61 AtomicString m_mimeType;
63 AtomicString m_encoding; 62 AtomicString m_encoding;
64 }; 63 };
65 64
66 } // namespace blink 65 } // namespace blink
67 66
68 #endif // TextResourceDecoderBuilder_h 67 #endif // TextResourceDecoderBuilder_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698