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

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

Issue 373423002: Split Dictionary's get and convert into DictionaryHelper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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
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 15 matching lines...) Expand all
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 32
33 #include "modules/encoding/TextEncoder.h" 33 #include "modules/encoding/TextEncoder.h"
34 34
35 #include "bindings/core/v8/Dictionary.h" 35 #include "bindings/core/v8/Dictionary.h"
36 #include "bindings/core/v8/DictionaryHelper.h"
36 #include "bindings/core/v8/ExceptionState.h" 37 #include "bindings/core/v8/ExceptionState.h"
37 #include "wtf/text/CString.h" 38 #include "wtf/text/CString.h"
38 #include "wtf/text/TextEncodingRegistry.h" 39 #include "wtf/text/TextEncodingRegistry.h"
39 40
40 namespace WebCore { 41 namespace WebCore {
41 42
42 TextEncoder* TextEncoder::create(const String& utfLabel, ExceptionState& excepti onState) 43 TextEncoder* TextEncoder::create(const String& utfLabel, ExceptionState& excepti onState)
43 { 44 {
44 WTF::TextEncoding encoding(utfLabel); 45 WTF::TextEncoding encoding(utfLabel);
45 if (!encoding.isValid()) { 46 if (!encoding.isValid()) {
(...skipping 23 matching lines...) Expand all
69 String TextEncoder::encoding() const 70 String TextEncoder::encoding() const
70 { 71 {
71 String name = String(m_encoding.name()).lower(); 72 String name = String(m_encoding.name()).lower();
72 ASSERT(name == "utf-8" || name == "utf-16le" || name == "utf-16be"); 73 ASSERT(name == "utf-8" || name == "utf-16le" || name == "utf-16be");
73 return name; 74 return name;
74 } 75 }
75 76
76 PassRefPtr<Uint8Array> TextEncoder::encode(const String& input, const Dictionary & options) 77 PassRefPtr<Uint8Array> TextEncoder::encode(const String& input, const Dictionary & options)
77 { 78 {
78 bool stream = false; 79 bool stream = false;
79 options.get("stream", stream); 80 DictionaryHelper::get(options, "stream", stream);
80 81
81 // FIXME: Not flushing is not supported by TextCodec for encode; add it or 82 // FIXME: Not flushing is not supported by TextCodec for encode; add it or
82 // handle split surrogates here. 83 // handle split surrogates here.
83 84
84 CString result; 85 CString result;
85 if (input.is8Bit()) 86 if (input.is8Bit())
86 result = m_codec->encode(input.characters8(), input.length(), WTF::Quest ionMarksForUnencodables); 87 result = m_codec->encode(input.characters8(), input.length(), WTF::Quest ionMarksForUnencodables);
87 else 88 else
88 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables); 89 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables);
89 90
90 const char* buffer = result.data(); 91 const char* buffer = result.data();
91 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer); 92 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer);
92 93
93 return Uint8Array::create(unsignedBuffer, result.length()); 94 return Uint8Array::create(unsignedBuffer, result.length());
94 } 95 }
95 96
96 } // namespace WebCore 97 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698