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

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

Issue 606653006: bindings: Adds DOMArrayBuffer, etc. as thin wrappers for ArrayBuffer, etc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Synced. Created 6 years, 2 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/TextEncoder.h » ('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" 32 #include "modules/encoding/TextDecoder.h"
34 33
35 #include "bindings/core/v8/ExceptionState.h" 34 #include "bindings/core/v8/ExceptionState.h"
35 #include "core/dom/DOMArrayBufferView.h"
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "wtf/StringExtras.h" 37 #include "wtf/StringExtras.h"
38 #include "wtf/text/TextEncodingRegistry.h" 38 #include "wtf/text/TextEncodingRegistry.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 TextDecoder* TextDecoder::create(const String& label, const TextDecoderOptions& options, ExceptionState& exceptionState) 42 TextDecoder* TextDecoder::create(const String& label, const TextDecoderOptions& options, ExceptionState& exceptionState)
43 { 43 {
44 WTF::TextEncoding encoding(label); 44 WTF::TextEncoding encoding(label);
45 // The replacement encoding is not valid, but the Encoding API also 45 // The replacement encoding is not valid, but the Encoding API also
(...skipping 23 matching lines...) Expand all
69 String TextDecoder::encoding() const 69 String TextDecoder::encoding() const
70 { 70 {
71 String name = String(m_encoding.name()).lower(); 71 String name = String(m_encoding.name()).lower();
72 // Where possible, encoding aliases should be handled by changes to Chromium 's ICU or Blink's WTF. 72 // Where possible, encoding aliases should be handled by changes to Chromium 's ICU or Blink's WTF.
73 // The same codec is used, but WTF maintains a different name/identity for t hese. 73 // The same codec is used, but WTF maintains a different name/identity for t hese.
74 if (name == "iso-8859-1" || name == "us-ascii") 74 if (name == "iso-8859-1" || name == "us-ascii")
75 return "windows-1252"; 75 return "windows-1252";
76 return name; 76 return name;
77 } 77 }
78 78
79 String TextDecoder::decode(ArrayBufferView* input, const TextDecodeOptions& opti ons, ExceptionState& exceptionState) 79 String TextDecoder::decode(DOMArrayBufferView* input, const TextDecodeOptions& o ptions, ExceptionState& exceptionState)
80 { 80 {
81 const char* start = input ? static_cast<const char*>(input->baseAddress()) : 0; 81 const char* start = input ? static_cast<const char*>(input->baseAddress()) : 0;
82 size_t length = input ? input->byteLength() : 0; 82 size_t length = input ? input->byteLength() : 0;
83 83
84 WTF::FlushBehavior flush = options.stream() ? WTF::DoNotFlush : WTF::DataEOF ; 84 WTF::FlushBehavior flush = options.stream() ? WTF::DoNotFlush : WTF::DataEOF ;
85 85
86 bool sawError = false; 86 bool sawError = false;
87 String s = m_codec->decode(start, length, flush, m_fatal, sawError); 87 String s = m_codec->decode(start, length, flush, m_fatal, sawError);
88 88
89 if (m_fatal && sawError) { 89 if (m_fatal && sawError) {
(...skipping 14 matching lines...) Expand all
104 return s; 104 return s;
105 } 105 }
106 106
107 String TextDecoder::decode(ExceptionState& exceptionState) 107 String TextDecoder::decode(ExceptionState& exceptionState)
108 { 108 {
109 TextDecodeOptions options; 109 TextDecodeOptions options;
110 return decode(0, options, exceptionState); 110 return decode(0, options, exceptionState);
111 } 111 }
112 112
113 } // namespace blink 113 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextDecoder.h ('k') | Source/modules/encoding/TextEncoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698