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

Side by Side Diff: Source/core/dom/DocumentEncodingData.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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/DocumentEncodingData.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef DocumentEncodingData_h 31 #ifndef DocumentEncodingData_h
32 #define DocumentEncodingData_h 32 #define DocumentEncodingData_h
33 33
34 #include "wtf/text/TextEncoding.h" 34 #include "wtf/text/TextEncoding.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 class TextResourceDecoder;
38 37
39 class DocumentEncodingData { 38 struct DocumentEncodingData {
40 public: 39 DocumentEncodingData()
41 DocumentEncodingData(); 40 : wasDetectedHeuristically(false)
42 explicit DocumentEncodingData(const TextResourceDecoder&); 41 , sawDecodingError(false)
42 {
43 }
43 44
44 const WTF::TextEncoding& encoding() const { return m_encoding; } 45 WTF::TextEncoding encoding;
45 void setEncoding(const WTF::TextEncoding&); 46 bool wasDetectedHeuristically;
46 bool wasDetectedHeuristically() const { return m_wasDetectedHeuristically; } 47 bool sawDecodingError;
47 bool sawDecodingError() const { return m_sawDecodingError; }
48
49 private:
50 WTF::TextEncoding m_encoding;
51 bool m_wasDetectedHeuristically;
52 bool m_sawDecodingError;
53 }; 48 };
54 49
55 inline bool operator!=(const DocumentEncodingData& a, const DocumentEncodingData & b)
56 {
57 return a.encoding() != b.encoding()
58 || a.wasDetectedHeuristically() != b.wasDetectedHeuristically()
59 || a.sawDecodingError() != b.sawDecodingError();
60 }
61
62 } // namespace WebCore 50 } // namespace WebCore
63 51
64 #endif // DocumentEncodingData_h 52 #endif // DocumentEncodingData_h
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/DocumentEncodingData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698