Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(801)

Unified Diff: Source/core/html/parser/TextResourceDecoder.h

Issue 133273007: Revert "Moved text decoding to the parser thread" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/parser/TextDocumentParser.cpp ('k') | Source/core/html/parser/TextResourceDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/parser/TextResourceDecoder.h
diff --git a/Source/core/html/parser/TextResourceDecoder.h b/Source/core/html/parser/TextResourceDecoder.h
deleted file mode 100644
index 5ad2ad561f8e11b9e7bb4e5e42807a5af2bedfdf..0000000000000000000000000000000000000000
--- a/Source/core/html/parser/TextResourceDecoder.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- Copyright (C) 1999 Lars Knoll (knoll@mpi-hd.mpg.de)
- Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
- Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
-*/
-
-#ifndef TextResourceDecoder_h
-#define TextResourceDecoder_h
-
-#include "wtf/RefCounted.h"
-#include "wtf/text/TextEncoding.h"
-
-namespace WebCore {
-
-class DocumentEncodingData;
-class HTMLMetaCharsetParser;
-
-class TextResourceDecoder {
-public:
- enum EncodingSource {
- DefaultEncoding,
- AutoDetectedEncoding,
- EncodingFromContentSniffing,
- EncodingFromXMLHeader,
- EncodingFromMetaTag,
- EncodingFromCSSCharset,
- EncodingFromHTTPHeader,
- UserChosenEncoding,
- EncodingFromParentFrame
- };
-
- static PassOwnPtr<TextResourceDecoder> create(const String& mimeType, const WTF::TextEncoding& defaultEncoding = WTF::TextEncoding(), bool usesEncodingDetector = false)
- {
- return adoptPtr(new TextResourceDecoder(mimeType, defaultEncoding, usesEncodingDetector));
- }
- ~TextResourceDecoder();
-
- void setEncoding(const WTF::TextEncoding&, EncodingSource);
- const WTF::TextEncoding& encoding() const { return m_encoding; }
- bool encodingWasDetectedHeuristically() const
- {
- return m_source == AutoDetectedEncoding
- || m_source == EncodingFromContentSniffing;
- }
-
- String decode(const char* data, size_t length);
- String flush();
-
- void setHintEncoding(const WTF::TextEncoding& encoding)
- {
- m_hintEncoding = encoding.name();
- }
-
- void useLenientXMLDecoding() { m_useLenientXMLDecoding = true; }
- bool sawError() const { return m_sawError; }
-
-private:
- TextResourceDecoder(const String& mimeType, const WTF::TextEncoding& defaultEncoding, bool usesEncodingDetector);
-
- enum ContentType { PlainTextContent, HTMLContent, XMLContent, CSSContent }; // PlainText only checks for BOM.
- static ContentType determineContentType(const String& mimeType);
- static const WTF::TextEncoding& defaultEncoding(ContentType, const WTF::TextEncoding& defaultEncoding);
-
- size_t checkForBOM(const char*, size_t);
- bool checkForCSSCharset(const char*, size_t, bool& movedDataToBuffer);
- bool checkForXMLCharset(const char*, size_t, bool& movedDataToBuffer);
- void checkForMetaCharset(const char*, size_t);
- void detectJapaneseEncoding(const char*, size_t);
- bool shouldAutoDetect() const;
-
- ContentType m_contentType;
- WTF::TextEncoding m_encoding;
- OwnPtr<TextCodec> m_codec;
- EncodingSource m_source;
- const char* m_hintEncoding;
- Vector<char> m_buffer;
- bool m_checkedForBOM;
- bool m_checkedForCSSCharset;
- bool m_checkedForXMLCharset;
- bool m_checkedForMetaCharset;
- bool m_useLenientXMLDecoding; // Don't stop on XML decoding errors.
- bool m_sawError;
- bool m_usesEncodingDetector;
-
- OwnPtr<HTMLMetaCharsetParser> m_charsetParser;
-};
-
-}
-
-#endif
« no previous file with comments | « Source/core/html/parser/TextDocumentParser.cpp ('k') | Source/core/html/parser/TextResourceDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698