Chromium Code Reviews Chromium Code Reviews
Issue 74513003:
Moved text decoding to the parser thread (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@parserthread_step25| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 Copyright (C) 1999 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1999 Lars Knoll (knoll@mpi-hd.mpg.de) |
| 3 Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 3 Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 4 Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 4 Copyright (C) 2006, 2008 Apple Inc. All rights reserved. |
| 5 | 5 |
| 6 This library is free software; you can redistribute it and/or | 6 This library is free software; you can redistribute it and/or |
| 7 modify it under the terms of the GNU Library General Public | 7 modify it under the terms of the GNU Library General Public |
| 8 License as published by the Free Software Foundation; either | 8 License as published by the Free Software Foundation; either |
| 9 version 2 of the License, or (at your option) any later version. | 9 version 2 of the License, or (at your option) any later version. |
| 10 | 10 |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #ifndef TextResourceDecoder_h | 23 #ifndef TextResourceDecoder_h |
| 24 #define TextResourceDecoder_h | 24 #define TextResourceDecoder_h |
| 25 | 25 |
| 26 #include "wtf/RefCounted.h" | 26 #include "wtf/RefCounted.h" |
| 27 #include "wtf/text/TextEncoding.h" | 27 #include "wtf/text/TextEncoding.h" |
| 28 | 28 |
| 29 namespace WebCore { | 29 namespace WebCore { |
| 30 | 30 |
| 31 class DocumentEncodingData; | |
| 31 class HTMLMetaCharsetParser; | 32 class HTMLMetaCharsetParser; |
| 32 | 33 |
| 33 class TextResourceDecoder { | 34 class TextResourceDecoder { |
| 34 public: | 35 public: |
| 35 enum EncodingSource { | 36 enum EncodingSource { |
| 36 DefaultEncoding, | 37 DefaultEncoding, |
| 37 AutoDetectedEncoding, | 38 AutoDetectedEncoding, |
| 38 EncodingFromContentSniffing, | 39 EncodingFromContentSniffing, |
| 39 EncodingFromXMLHeader, | 40 EncodingFromXMLHeader, |
| 40 EncodingFromMetaTag, | 41 EncodingFromMetaTag, |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 static ContentType determineContentType(const String& mimeType); | 77 static ContentType determineContentType(const String& mimeType); |
| 77 static const WTF::TextEncoding& defaultEncoding(ContentType, const WTF::Text Encoding& defaultEncoding); | 78 static const WTF::TextEncoding& defaultEncoding(ContentType, const WTF::Text Encoding& defaultEncoding); |
| 78 | 79 |
| 79 size_t checkForBOM(const char*, size_t); | 80 size_t checkForBOM(const char*, size_t); |
| 80 bool checkForCSSCharset(const char*, size_t, bool& movedDataToBuffer); | 81 bool checkForCSSCharset(const char*, size_t, bool& movedDataToBuffer); |
| 81 bool checkForXMLCharset(const char*, size_t, bool& movedDataToBuffer); | 82 bool checkForXMLCharset(const char*, size_t, bool& movedDataToBuffer); |
| 82 void checkForMetaCharset(const char*, size_t); | 83 void checkForMetaCharset(const char*, size_t); |
| 83 void detectJapaneseEncoding(const char*, size_t); | 84 void detectJapaneseEncoding(const char*, size_t); |
| 84 bool shouldAutoDetect() const; | 85 bool shouldAutoDetect() const; |
| 85 | 86 |
| 87 | |
|
eseidel
2013/11/19 22:27:45
Intentional?
oystein (OOO til 10th of July)
2013/11/19 22:52:19
Whoops. Nope.
| |
| 88 | |
| 86 ContentType m_contentType; | 89 ContentType m_contentType; |
| 87 WTF::TextEncoding m_encoding; | 90 WTF::TextEncoding m_encoding; |
| 88 OwnPtr<TextCodec> m_codec; | 91 OwnPtr<TextCodec> m_codec; |
| 89 EncodingSource m_source; | 92 EncodingSource m_source; |
| 90 const char* m_hintEncoding; | 93 const char* m_hintEncoding; |
| 91 Vector<char> m_buffer; | 94 Vector<char> m_buffer; |
| 92 bool m_checkedForBOM; | 95 bool m_checkedForBOM; |
| 93 bool m_checkedForCSSCharset; | 96 bool m_checkedForCSSCharset; |
| 94 bool m_checkedForXMLCharset; | 97 bool m_checkedForXMLCharset; |
| 95 bool m_checkedForMetaCharset; | 98 bool m_checkedForMetaCharset; |
| 96 bool m_useLenientXMLDecoding; // Don't stop on XML decoding errors. | 99 bool m_useLenientXMLDecoding; // Don't stop on XML decoding errors. |
| 97 bool m_sawError; | 100 bool m_sawError; |
| 98 bool m_usesEncodingDetector; | 101 bool m_usesEncodingDetector; |
| 99 | 102 |
| 100 OwnPtr<HTMLMetaCharsetParser> m_charsetParser; | 103 OwnPtr<HTMLMetaCharsetParser> m_charsetParser; |
| 101 }; | 104 }; |
| 102 | 105 |
| 103 } | 106 } |
| 104 | 107 |
| 105 #endif | 108 #endif |
| OLD | NEW |
