| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 | 44 |
| 45 WTF::TextEncoding encoding(encodingLabel); | 45 WTF::TextEncoding encoding(encodingLabel); |
| 46 if (!encoding.isValid()) { | 46 if (!encoding.isValid()) { |
| 47 exceptionState.throwTypeError("The encoding label provided ('" + encodin
gLabel + "') is invalid."); | 47 exceptionState.throwTypeError("The encoding label provided ('" + encodin
gLabel + "') is invalid."); |
| 48 return 0; | 48 return 0; |
| 49 } | 49 } |
| 50 | 50 |
| 51 bool fatal = false; | 51 bool fatal = false; |
| 52 options.get("fatal", fatal); | 52 options.get("fatal", fatal); |
| 53 | 53 |
| 54 return new TextDecoder(encoding.name(), fatal); | 54 return new TextDecoder(encoding, fatal); |
| 55 } | 55 } |
| 56 | 56 |
| 57 | 57 |
| 58 TextDecoder::TextDecoder(const String& encoding, bool fatal) | 58 TextDecoder::TextDecoder(const WTF::TextEncoding& encoding, bool fatal) |
| 59 : m_encoding(encoding) | 59 : m_encoding(encoding) |
| 60 , m_codec(newTextCodec(m_encoding)) | 60 , m_codec(newTextCodec(encoding)) |
| 61 , m_fatal(fatal) | 61 , m_fatal(fatal) |
| 62 , m_bomSeen(false) | 62 , m_bomSeen(false) |
| 63 { | 63 { |
| 64 } | 64 } |
| 65 | 65 |
| 66 TextDecoder::~TextDecoder() | 66 TextDecoder::~TextDecoder() |
| 67 { | 67 { |
| 68 } | 68 } |
| 69 | 69 |
| 70 String TextDecoder::encoding() const | 70 String TextDecoder::encoding() const |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 s.remove(0); | 102 s.remove(0); |
| 103 } | 103 } |
| 104 | 104 |
| 105 if (flush) | 105 if (flush) |
| 106 m_bomSeen = false; | 106 m_bomSeen = false; |
| 107 | 107 |
| 108 return s; | 108 return s; |
| 109 } | 109 } |
| 110 | 110 |
| 111 } // namespace WebCore | 111 } // namespace WebCore |
| OLD | NEW |