| OLD | NEW |
| 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 29 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 DEFINE_GC_INFO(TextDecoder); | 41 DEFINE_GC_INFO(TextDecoder); |
| 42 | 42 |
| 43 PassRefPtrWillBeRawPtr<TextDecoder> TextDecoder::create(const String& label, con
st Dictionary& options, ExceptionState& exceptionState) | 43 PassRefPtrWillBeRawPtr<TextDecoder> TextDecoder::create(const String& label, con
st Dictionary& options, ExceptionState& exceptionState) |
| 44 { | 44 { |
| 45 const String& encodingLabel = label.isNull() ? String("utf-8") : label; | 45 const String& encodingLabel = label.isNull() ? String("utf-8") : label; |
| 46 | 46 |
| 47 WTF::TextEncoding encoding(encodingLabel); | 47 WTF::TextEncoding encoding(encodingLabel); |
| 48 if (!encoding.isValid()) { | 48 if (!encoding.isValid()) { |
| 49 exceptionState.throwTypeError("The encoding label provided ('" + encodin
gLabel + "') is invalid."); | 49 exceptionState.throwTypeError("The encoding label provided ('" + encodin
gLabel + "') is invalid."); |
| 50 return 0; | 50 return nullptr; |
| 51 } | 51 } |
| 52 | 52 |
| 53 bool fatal = false; | 53 bool fatal = false; |
| 54 options.get("fatal", fatal); | 54 options.get("fatal", fatal); |
| 55 | 55 |
| 56 return adoptRefWillBeNoop(new TextDecoder(encoding.name(), fatal)); | 56 return adoptRefWillBeNoop(new TextDecoder(encoding.name(), fatal)); |
| 57 } | 57 } |
| 58 | 58 |
| 59 | 59 |
| 60 TextDecoder::TextDecoder(const String& encoding, bool fatal) | 60 TextDecoder::TextDecoder(const String& encoding, bool fatal) |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 s.remove(0); | 107 s.remove(0); |
| 108 } | 108 } |
| 109 | 109 |
| 110 if (flush) | 110 if (flush) |
| 111 m_bomSeen = false; | 111 m_bomSeen = false; |
| 112 | 112 |
| 113 return s; | 113 return s; |
| 114 } | 114 } |
| 115 | 115 |
| 116 } // namespace WebCore | 116 } // namespace WebCore |
| OLD | NEW |