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

Side by Side Diff: Source/core/html/parser/TextResourceDecoder.h

Issue 1145773003: Remove the Document.charset setter (making it readonly) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix webexposed tests Created 5 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 23 matching lines...) Expand all
34 class CORE_EXPORT TextResourceDecoder { 34 class CORE_EXPORT TextResourceDecoder {
35 public: 35 public:
36 enum EncodingSource { 36 enum EncodingSource {
37 DefaultEncoding, 37 DefaultEncoding,
38 AutoDetectedEncoding, 38 AutoDetectedEncoding,
39 EncodingFromContentSniffing, 39 EncodingFromContentSniffing,
40 EncodingFromXMLHeader, 40 EncodingFromXMLHeader,
41 EncodingFromMetaTag, 41 EncodingFromMetaTag,
42 EncodingFromCSSCharset, 42 EncodingFromCSSCharset,
43 EncodingFromHTTPHeader, 43 EncodingFromHTTPHeader,
44 UserChosenEncoding,
45 EncodingFromParentFrame 44 EncodingFromParentFrame
46 }; 45 };
47 46
48 static PassOwnPtr<TextResourceDecoder> create(const String& mimeType, const WTF::TextEncoding& defaultEncoding = WTF::TextEncoding(), bool usesEncodingDetec tor = false) 47 static PassOwnPtr<TextResourceDecoder> create(const String& mimeType, const WTF::TextEncoding& defaultEncoding = WTF::TextEncoding(), bool usesEncodingDetec tor = false)
49 { 48 {
50 return adoptPtr(new TextResourceDecoder(mimeType, defaultEncoding, usesE ncodingDetector)); 49 return adoptPtr(new TextResourceDecoder(mimeType, defaultEncoding, usesE ncodingDetector));
51 } 50 }
52 ~TextResourceDecoder(); 51 ~TextResourceDecoder();
53 52
54 void setEncoding(const WTF::TextEncoding&, EncodingSource); 53 void setEncoding(const WTF::TextEncoding&, EncodingSource);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 bool m_useLenientXMLDecoding; // Don't stop on XML decoding errors. 96 bool m_useLenientXMLDecoding; // Don't stop on XML decoding errors.
98 bool m_sawError; 97 bool m_sawError;
99 bool m_usesEncodingDetector; 98 bool m_usesEncodingDetector;
100 99
101 OwnPtr<HTMLMetaCharsetParser> m_charsetParser; 100 OwnPtr<HTMLMetaCharsetParser> m_charsetParser;
102 }; 101 };
103 102
104 } 103 }
105 104
106 #endif 105 #endif
OLDNEW
« no previous file with comments | « Source/core/html/HTMLSelectElementTest.cpp ('k') | Source/core/html/parser/TextResourceDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698