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

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

Issue 15901002: Implement Encoding API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaseline webexposed global constructor tests Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/encoding/TextDecoder.h ('k') | Source/modules/encoding/TextDecoder.idl » ('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 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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 #include "config.h" 31 #include "config.h"
32
33 #include "modules/encoding/TextDecoder.h"
34
32 #include "bindings/v8/ExceptionState.h" 35 #include "bindings/v8/ExceptionState.h"
33
34 #include "bindings/v8/V8ThrowException.h"
35 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "wtf/text/TextEncodingRegistry.h"
36 38
37 namespace WebCore { 39 namespace WebCore {
38 40
39 void ExceptionState::clearException() 41 PassRefPtr<TextDecoder> TextDecoder::create(const String& label, const Dictionar y& options, ExceptionState& es)
40 { 42 {
41 m_code = 0; 43 const String& encodingLabel = label.isNull() ? String("utf-8") : label;
42 m_exception.clear(); 44
45 WTF::TextEncoding encoding(encodingLabel);
46 if (!encoding.isValid()) {
47 es.throwTypeError();
48 return 0;
49 }
50
51 bool fatal = false;
52 options.get("fatal", fatal);
53
54 return adoptRef(new TextDecoder(encoding.name(), fatal));
43 } 55 }
44 56
45 void ExceptionState::throwDOMException(const ExceptionCode& ec, const String& me ssage) 57
58 TextDecoder::TextDecoder(const String& encoding, bool fatal)
59 : m_encoding(encoding)
60 , m_codec(newTextCodec(m_encoding))
61 , m_fatal(fatal)
46 { 62 {
47 ASSERT(ec);
48 m_code = ec;
49 setException(V8ThrowException::createDOMException(ec, message, m_isolate));
50 } 63 }
51 64
52 void ExceptionState::setException(v8::Handle<v8::Value> exception) 65 TextDecoder::~TextDecoder()
53 { 66 {
54 if (exception.IsEmpty()) { 67 }
55 clearException(); 68
56 return; 69 String TextDecoder::encoding() const
70 {
71 return String(m_encoding.name()).lower();
72 }
73
74 String TextDecoder::decode(ArrayBufferView* input, const Dictionary& options, Ex ceptionState& es)
75 {
76 bool stream = false;
77 options.get("stream", stream);
78
79 const char* start = input ? static_cast<const char*>(input->baseAddress()) : 0;
80 size_t length = input ? input->byteLength() : 0;
81
82 bool flush = !stream;
83
84 // FIXME: Not all TextCodec implementations handle |flush| - notably TextCod ecUTF16
85 // ignores it and never flushes!
86
87 bool sawError = false;
88 String s = m_codec->decode(start, length, flush, m_fatal, sawError);
89
90 if (m_fatal && sawError) {
91 es.throwDOMException(EncodingError, "The encoded data was not valid.");
92 return String();
57 } 93 }
58 94
59 m_exception.set(m_isolate, exception); 95 return s;
60 }
61
62 void ExceptionState::throwTypeError(const String& message)
63 {
64 m_code = TypeError;
65 setException(V8ThrowException::createTypeError(message, m_isolate));
66 }
67
68 NonThrowExceptionState::NonThrowExceptionState()
69 : ExceptionState(0) { }
70
71 void NonThrowExceptionState::throwDOMException(const ExceptionCode& ec, const St ring&)
72 {
73 m_code = ec;
74 }
75
76 void NonThrowExceptionState::throwTypeError(const String&)
77 {
78 m_code = TypeError;
79 } 96 }
80 97
81 } // namespace WebCore 98 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextDecoder.h ('k') | Source/modules/encoding/TextDecoder.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698