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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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/encryptedmedia/MediaKeys.cpp » ('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 30 matching lines...) Expand all
41 41
42 DEFINE_GC_INFO(TextEncoder); 42 DEFINE_GC_INFO(TextEncoder);
43 43
44 PassRefPtrWillBeRawPtr<TextEncoder> TextEncoder::create(const String& utfLabel, ExceptionState& exceptionState) 44 PassRefPtrWillBeRawPtr<TextEncoder> TextEncoder::create(const String& utfLabel, ExceptionState& exceptionState)
45 { 45 {
46 const String& encodingLabel = utfLabel.isNull() ? String("utf-8") : utfLabel ; 46 const String& encodingLabel = utfLabel.isNull() ? String("utf-8") : utfLabel ;
47 47
48 WTF::TextEncoding encoding(encodingLabel); 48 WTF::TextEncoding encoding(encodingLabel);
49 if (!encoding.isValid()) { 49 if (!encoding.isValid()) {
50 exceptionState.throwTypeError("The encoding label provided ('" + encodin gLabel + "') is invalid."); 50 exceptionState.throwTypeError("The encoding label provided ('" + encodin gLabel + "') is invalid.");
51 return 0; 51 return nullptr;
52 } 52 }
53 53
54 String name(encoding.name()); 54 String name(encoding.name());
55 if (name != "UTF-8" && name != "UTF-16LE" && name != "UTF-16BE") { 55 if (name != "UTF-8" && name != "UTF-16LE" && name != "UTF-16BE") {
56 exceptionState.throwTypeError("The encoding provided ('" + encodingLabel + "') is not one of 'utf-8', 'utf-16', or 'utf-16be'."); 56 exceptionState.throwTypeError("The encoding provided ('" + encodingLabel + "') is not one of 'utf-8', 'utf-16', or 'utf-16be'.");
57 return 0; 57 return nullptr;
58 } 58 }
59 59
60 return adoptRefWillBeNoop(new TextEncoder(encoding.name())); 60 return adoptRefWillBeNoop(new TextEncoder(encoding.name()));
61 } 61 }
62 62
63 TextEncoder::TextEncoder(const String& encoding) 63 TextEncoder::TextEncoder(const String& encoding)
64 : m_encoding(encoding) 64 : m_encoding(encoding)
65 , m_codec(newTextCodec(m_encoding)) 65 , m_codec(newTextCodec(m_encoding))
66 { 66 {
67 } 67 }
(...skipping 23 matching lines...) Expand all
91 else 91 else
92 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables); 92 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables);
93 93
94 const char* buffer = result.data(); 94 const char* buffer = result.data();
95 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer); 95 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer);
96 96
97 return Uint8Array::create(unsignedBuffer, result.length()); 97 return Uint8Array::create(unsignedBuffer, result.length());
98 } 98 }
99 99
100 } // namespace WebCore 100 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextDecoder.cpp ('k') | Source/modules/encryptedmedia/MediaKeys.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698