| 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 20 matching lines...) Expand all  Loading... | 
| 31 #include "config.h" | 31 #include "config.h" | 
| 32 | 32 | 
| 33 #include "modules/encoding/TextDecoder.h" | 33 #include "modules/encoding/TextDecoder.h" | 
| 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/text/TextEncodingRegistry.h" | 37 #include "wtf/text/TextEncodingRegistry.h" | 
| 38 | 38 | 
| 39 namespace WebCore { | 39 namespace WebCore { | 
| 40 | 40 | 
| 41 DEFINE_GC_INFO(TextDecoder); | 41 PassRefPtr<TextDecoder> TextDecoder::create(const String& label, const Dictionar
     y& options, ExceptionState& exceptionState) | 
| 42 |  | 
| 43 PassRefPtrWillBeRawPtr<TextDecoder> TextDecoder::create(const String& label, con
     st Dictionary& options, ExceptionState& exceptionState) |  | 
| 44 { | 42 { | 
| 45     const String& encodingLabel = label.isNull() ? String("utf-8") : label; | 43     const String& encodingLabel = label.isNull() ? String("utf-8") : label; | 
| 46 | 44 | 
| 47     WTF::TextEncoding encoding(encodingLabel); | 45     WTF::TextEncoding encoding(encodingLabel); | 
| 48     if (!encoding.isValid()) { | 46     if (!encoding.isValid()) { | 
| 49         exceptionState.throwTypeError("The encoding label provided ('" + encodin
     gLabel + "') is invalid."); | 47         exceptionState.throwTypeError("The encoding label provided ('" + encodin
     gLabel + "') is invalid."); | 
| 50         return 0; | 48         return 0; | 
| 51     } | 49     } | 
| 52 | 50 | 
| 53     bool fatal = false; | 51     bool fatal = false; | 
| 54     options.get("fatal", fatal); | 52     options.get("fatal", fatal); | 
| 55 | 53 | 
| 56     return adoptRefWillBeNoop(new TextDecoder(encoding.name(), fatal)); | 54     return adoptRef(new TextDecoder(encoding.name(), fatal)); | 
| 57 } | 55 } | 
| 58 | 56 | 
| 59 | 57 | 
| 60 TextDecoder::TextDecoder(const String& encoding, bool fatal) | 58 TextDecoder::TextDecoder(const String& encoding, bool fatal) | 
| 61     : m_encoding(encoding) | 59     : m_encoding(encoding) | 
| 62     , m_codec(newTextCodec(m_encoding)) | 60     , m_codec(newTextCodec(m_encoding)) | 
| 63     , m_fatal(fatal) | 61     , m_fatal(fatal) | 
| 64     , m_bomSeen(false) | 62     , m_bomSeen(false) | 
| 65 { | 63 { | 
| 66 } | 64 } | 
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 107             s.remove(0); | 105             s.remove(0); | 
| 108     } | 106     } | 
| 109 | 107 | 
| 110     if (flush) | 108     if (flush) | 
| 111         m_bomSeen = false; | 109         m_bomSeen = false; | 
| 112 | 110 | 
| 113     return s; | 111     return s; | 
| 114 } | 112 } | 
| 115 | 113 | 
| 116 } // namespace WebCore | 114 } // namespace WebCore | 
| OLD | NEW | 
|---|