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

Side by Side Diff: Source/modules/encoding/TextDecoder.h

Issue 564463002: Encoding API: Add TextDecodeOptions and TextDecoderOptions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@dic-webmidi
Patch Set: Rebase Created 6 years, 3 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
« no previous file with comments | « Source/modules/encoding/TextDecodeOptions.idl ('k') | Source/modules/encoding/TextDecoder.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 TextDecoder_h 31 #ifndef TextDecoder_h
32 #define TextDecoder_h 32 #define TextDecoder_h
33 33
34 #include "bindings/core/v8/Dictionary.h"
35 #include "bindings/core/v8/ScriptWrappable.h" 34 #include "bindings/core/v8/ScriptWrappable.h"
35 #include "modules/encoding/TextDecodeOptions.h"
36 #include "modules/encoding/TextDecoderOptions.h"
36 #include "platform/heap/Handle.h" 37 #include "platform/heap/Handle.h"
37 #include "wtf/ArrayBufferView.h" 38 #include "wtf/ArrayBufferView.h"
38 #include "wtf/text/TextCodec.h" 39 #include "wtf/text/TextCodec.h"
39 #include "wtf/text/TextEncoding.h" 40 #include "wtf/text/TextEncoding.h"
40 #include "wtf/text/WTFString.h" 41 #include "wtf/text/WTFString.h"
41 42
42 namespace blink { 43 namespace blink {
43 44
44 class ExceptionState; 45 class ExceptionState;
45 46
46 class TextDecoder FINAL : public GarbageCollectedFinalized<TextDecoder>, public ScriptWrappable { 47 class TextDecoder FINAL : public GarbageCollectedFinalized<TextDecoder>, public ScriptWrappable {
47 DEFINE_WRAPPERTYPEINFO(); 48 DEFINE_WRAPPERTYPEINFO();
48 public: 49 public:
49 static TextDecoder* create(const String& label, const Dictionary&, Exception State&); 50 static TextDecoder* create(const String& label, const TextDecoderOptions&, E xceptionState&);
50 ~TextDecoder(); 51 ~TextDecoder();
51 52
52 // Implement the IDL 53 // Implement the IDL
53 String encoding() const; 54 String encoding() const;
54 bool fatal() const { return m_fatal; } 55 bool fatal() const { return m_fatal; }
55 bool ignoreBOM() const { return m_ignoreBOM; } 56 bool ignoreBOM() const { return m_ignoreBOM; }
56 String decode(ArrayBufferView*, const Dictionary&, ExceptionState&); 57 String decode(ArrayBufferView*, const TextDecodeOptions&, ExceptionState&);
57 String decode(ExceptionState& exceptionState) { return decode(0, Dictionary( ), exceptionState); } 58 String decode(ExceptionState&);
58 59
59 void trace(Visitor*) { } 60 void trace(Visitor*) { }
60 61
61 private: 62 private:
62 TextDecoder(const WTF::TextEncoding&, bool fatal, bool ignoreBOM); 63 TextDecoder(const WTF::TextEncoding&, bool fatal, bool ignoreBOM);
63 64
64 WTF::TextEncoding m_encoding; 65 WTF::TextEncoding m_encoding;
65 OwnPtr<WTF::TextCodec> m_codec; 66 OwnPtr<WTF::TextCodec> m_codec;
66 bool m_fatal; 67 bool m_fatal;
67 bool m_ignoreBOM; 68 bool m_ignoreBOM;
68 bool m_bomSeen; 69 bool m_bomSeen;
69 }; 70 };
70 71
71 } // namespace blink 72 } // namespace blink
72 73
73 #endif // TextDecoder_h 74 #endif // TextDecoder_h
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextDecodeOptions.idl ('k') | Source/modules/encoding/TextDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698