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

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

Issue 1071283004: Encoding API: ignore leading/trailing whitespace in labels (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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.cpp ('k') | Source/modules/modules.gypi » ('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 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/ExceptionState.h" 35 #include "bindings/core/v8/ExceptionState.h"
36 #include "modules/encoding/Encoding.h"
36 #include "wtf/text/CString.h" 37 #include "wtf/text/CString.h"
37 #include "wtf/text/TextEncodingRegistry.h" 38 #include "wtf/text/TextEncodingRegistry.h"
38 39
39 namespace blink { 40 namespace blink {
40 41
41 TextEncoder* TextEncoder::create(const String& utfLabel, ExceptionState& excepti onState) 42 TextEncoder* TextEncoder::create(const String& utfLabel, ExceptionState& excepti onState)
42 { 43 {
43 WTF::TextEncoding encoding(utfLabel); 44 WTF::TextEncoding encoding(utfLabel.stripWhiteSpace(&Encoding::isASCIIWhiteS pace));
44 if (!encoding.isValid()) { 45 if (!encoding.isValid()) {
45 exceptionState.throwRangeError("The encoding label provided ('" + utfLab el + "') is invalid."); 46 exceptionState.throwRangeError("The encoding label provided ('" + utfLab el + "') is invalid.");
46 return 0; 47 return 0;
47 } 48 }
48 49
49 String name(encoding.name()); 50 String name(encoding.name());
50 if (name != "UTF-8" && name != "UTF-16LE" && name != "UTF-16BE") { 51 if (name != "UTF-8" && name != "UTF-16LE" && name != "UTF-16BE") {
51 exceptionState.throwRangeError("The encoding provided ('" + utfLabel + " ') is not one of 'utf-8', 'utf-16', or 'utf-16be'."); 52 exceptionState.throwRangeError("The encoding provided ('" + utfLabel + " ') is not one of 'utf-8', 'utf-16', or 'utf-16be'.");
52 return 0; 53 return 0;
53 } 54 }
(...skipping 26 matching lines...) Expand all
80 else 81 else
81 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables); 82 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables);
82 83
83 const char* buffer = result.data(); 84 const char* buffer = result.data();
84 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer); 85 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer);
85 86
86 return DOMUint8Array::create(unsignedBuffer, result.length()); 87 return DOMUint8Array::create(unsignedBuffer, result.length());
87 } 88 }
88 89
89 } // namespace blink 90 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextDecoder.cpp ('k') | Source/modules/modules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698