Chromium Code Reviews| Index: Source/modules/encoding/TextDecoder.cpp |
| diff --git a/Source/modules/encoding/TextDecoder.cpp b/Source/modules/encoding/TextDecoder.cpp |
| index 541540e6674acd489317f1660689209f67eec0a7..84df22cad1c6f5b8fa545d123d5e612747d6da51 100644 |
| --- a/Source/modules/encoding/TextDecoder.cpp |
| +++ b/Source/modules/encoding/TextDecoder.cpp |
| @@ -38,20 +38,20 @@ |
| namespace WebCore { |
| -PassRefPtrWillBeRawPtr<TextDecoder> TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& exceptionState) |
| +TextDecoder* TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& exceptionState) |
| { |
| const String& encodingLabel = label.isNull() ? String("utf-8") : label; |
| WTF::TextEncoding encoding(encodingLabel); |
| if (!encoding.isValid()) { |
| exceptionState.throwTypeError("The encoding label provided ('" + encodingLabel + "') is invalid."); |
| - return nullptr; |
| + return 0; |
|
haraken
2014/04/11 09:46:33
We need to change nullptr to 0 to make g++ happy.
Mads Ager (chromium)
2014/04/11 10:19:25
Yes and we will have similar changes when we have
|
| } |
| bool fatal = false; |
| options.get("fatal", fatal); |
| - return adoptRefWillBeNoop(new TextDecoder(encoding.name(), fatal)); |
| + return new TextDecoder(encoding.name(), fatal); |
| } |