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

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

Issue 313393005: Encoding API: Handle null input string (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | « LayoutTests/fast/encoding/api/basics.html ('k') | no next file » | 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 PassRefPtr<Uint8Array> TextEncoder::encode(const String& input, const Dictionary & options) 78 PassRefPtr<Uint8Array> TextEncoder::encode(const String& input, const Dictionary & options)
79 { 79 {
80 bool stream = false; 80 bool stream = false;
81 options.get("stream", stream); 81 options.get("stream", stream);
82 82
83 // FIXME: Not flushing is not supported by TextCodec for encode; add it or 83 // FIXME: Not flushing is not supported by TextCodec for encode; add it or
84 // handle split surrogates here. 84 // handle split surrogates here.
85 85
86 CString result; 86 CString result;
87 if (input.is8Bit()) 87 if (!input.isNull()) {
88 result = m_codec->encode(input.characters8(), input.length(), WTF::Quest ionMarksForUnencodables); 88 if (input.is8Bit())
89 else 89 result = m_codec->encode(input.characters8(), input.length(), WTF::Q uestionMarksForUnencodables);
90 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables); 90 else
91 result = m_codec->encode(input.characters16(), input.length(), WTF:: QuestionMarksForUnencodables);
92 }
91 93
92 const char* buffer = result.data(); 94 const char* buffer = result.data();
93 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer); 95 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer);
94 96
95 return Uint8Array::create(unsignedBuffer, result.length()); 97 return Uint8Array::create(unsignedBuffer, result.length());
96 } 98 }
97 99
98 } // namespace WebCore 100 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/encoding/api/basics.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698