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

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

Issue 356703002: Use IDL argument default values in modules/encoding/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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
« no previous file with comments | « no previous file | Source/modules/encoding/TextDecoder.idl » ('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 23 matching lines...) Expand all
34 34
35 #include "bindings/v8/ExceptionState.h" 35 #include "bindings/v8/ExceptionState.h"
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "wtf/StringExtras.h" 37 #include "wtf/StringExtras.h"
38 #include "wtf/text/TextEncodingRegistry.h" 38 #include "wtf/text/TextEncodingRegistry.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 TextDecoder* TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& exceptionState) 42 TextDecoder* TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& exceptionState)
43 { 43 {
44 const String& encodingLabel = label.isNull() ? String("utf-8") : label; 44 WTF::TextEncoding encoding(label);
45
46 WTF::TextEncoding encoding(encodingLabel);
47 // The replacement encoding is not valid, but the Encoding API also 45 // The replacement encoding is not valid, but the Encoding API also
48 // rejects aliases of the replacement encoding. 46 // rejects aliases of the replacement encoding.
49 if (!encoding.isValid() || !strcasecmp(encoding.name(), "replacement")) { 47 if (!encoding.isValid() || !strcasecmp(encoding.name(), "replacement")) {
50 exceptionState.throwTypeError("The encoding label provided ('" + encodin gLabel + "') is invalid."); 48 exceptionState.throwTypeError("The encoding label provided ('" + label + "') is invalid.");
51 return 0; 49 return 0;
52 } 50 }
53 51
54 bool fatal = false; 52 bool fatal = false;
55 options.get("fatal", fatal); 53 options.get("fatal", fatal);
56 54
57 bool ignoreBOM = false; 55 bool ignoreBOM = false;
58 options.get("ignoreBOM", ignoreBOM); 56 options.get("ignoreBOM", ignoreBOM);
59 57
60 return new TextDecoder(encoding, fatal, ignoreBOM); 58 return new TextDecoder(encoding, fatal, ignoreBOM);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 s.remove(0); 107 s.remove(0);
110 } 108 }
111 109
112 if (flush) 110 if (flush)
113 m_bomSeen = false; 111 m_bomSeen = false;
114 112
115 return s; 113 return s;
116 } 114 }
117 115
118 } // namespace WebCore 116 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/modules/encoding/TextDecoder.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698