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

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

Issue 120063002: Improve modules' TypeError exception messages. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years 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 27 matching lines...) Expand all
38 #include "wtf/text/TextEncodingRegistry.h" 38 #include "wtf/text/TextEncodingRegistry.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 PassRefPtr<TextEncoder> TextEncoder::create(const String& utfLabel, ExceptionSta te& exceptionState) 42 PassRefPtr<TextEncoder> TextEncoder::create(const String& utfLabel, ExceptionSta te& exceptionState)
43 { 43 {
44 const String& encodingLabel = utfLabel.isNull() ? String("utf-8") : utfLabel ; 44 const String& encodingLabel = utfLabel.isNull() ? String("utf-8") : utfLabel ;
45 45
46 WTF::TextEncoding encoding(encodingLabel); 46 WTF::TextEncoding encoding(encodingLabel);
47 if (!encoding.isValid()) { 47 if (!encoding.isValid()) {
48 exceptionState.throwUninformativeAndGenericTypeError(); 48 exceptionState.throwTypeError("The encoding label provided ('" + encodin gLabel + "') is invalid.");
49 return 0; 49 return 0;
50 } 50 }
51 51
52 String name(encoding.name()); 52 String name(encoding.name());
53 if (name != "UTF-8" && name != "UTF-16LE" && name != "UTF-16BE") { 53 if (name != "UTF-8" && name != "UTF-16LE" && name != "UTF-16BE") {
54 exceptionState.throwUninformativeAndGenericTypeError(); 54 exceptionState.throwTypeError("The encoding label provided ('" + encodin gLabel + "') is not one of 'UTF-8', 'UTF-16LE', or 'UTF-16BE'.");
jsbell 2013/12/20 17:47:50 Nit: Lots of labels aliases for these are accepted
jsbell 2013/12/20 17:51:08 And maybe "encoding provided" instead of "encoding
55 return 0; 55 return 0;
56 } 56 }
57 57
58 return adoptRef(new TextEncoder(encoding.name())); 58 return adoptRef(new TextEncoder(encoding.name()));
59 } 59 }
60 60
61 TextEncoder::TextEncoder(const String& encoding) 61 TextEncoder::TextEncoder(const String& encoding)
62 : m_encoding(encoding) 62 : m_encoding(encoding)
63 , m_codec(newTextCodec(m_encoding)) 63 , m_codec(newTextCodec(m_encoding))
64 { 64 {
(...skipping 24 matching lines...) Expand all
89 else 89 else
90 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables); 90 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables);
91 91
92 const char* buffer = result.data(); 92 const char* buffer = result.data();
93 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer); 93 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer);
94 94
95 return Uint8Array::create(unsignedBuffer, result.length()); 95 return Uint8Array::create(unsignedBuffer, result.length());
96 } 96 }
97 97
98 } // namespace WebCore 98 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextDecoder.cpp ('k') | Source/modules/imagebitmap/ImageBitmapFactories.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698