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

Side by Side Diff: Source/core/dom/DecodedDataDocumentParser.cpp

Issue 118573002: Revert of Moved text decoding to the parser thread (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@parserthread_step25
Patch Set: Compile fix Created 7 years 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/DecodedDataDocumentParser.h ('k') | Source/core/dom/Document.h » ('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) 2010 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2010 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/dom/DecodedDataDocumentParser.h" 27 #include "core/dom/DecodedDataDocumentParser.h"
28 28
29 #include "core/dom/Document.h" 29 #include "core/dom/Document.h"
30 #include "core/dom/DocumentEncodingData.h" 30 #include "core/dom/DocumentEncodingData.h"
31 #include "core/html/parser/TextResourceDecoder.h" 31 #include "core/fetch/TextResourceDecoder.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 DecodedDataDocumentParser::DecodedDataDocumentParser(Document* document) 35 DecodedDataDocumentParser::DecodedDataDocumentParser(Document* document)
36 : DocumentParser(document) 36 : DocumentParser(document)
37 , m_needsDecoder(true) 37 , m_hasAppendedData(false)
38 { 38 {
39 } 39 }
40 40
41 DecodedDataDocumentParser::~DecodedDataDocumentParser() 41 DecodedDataDocumentParser::~DecodedDataDocumentParser()
42 { 42 {
43 } 43 }
44 44
45 void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decod er) 45 void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decod er)
46 { 46 {
47 m_needsDecoder = false;
48 m_decoder = decoder; 47 m_decoder = decoder;
49 } 48 }
50 49
51 TextResourceDecoder* DecodedDataDocumentParser::decoder() 50 TextResourceDecoder* DecodedDataDocumentParser::decoder()
52 { 51 {
53 return m_decoder.get(); 52 return m_decoder.get();
54 } 53 }
55 54
56 PassOwnPtr<TextResourceDecoder> DecodedDataDocumentParser::takeDecoder() 55 void DecodedDataDocumentParser::setHasAppendedData()
57 { 56 {
58 return m_decoder.release(); 57 m_hasAppendedData = true;
59 } 58 }
60 59
61 void DecodedDataDocumentParser::appendBytes(const char* data, size_t length) 60 void DecodedDataDocumentParser::appendBytes(const char* data, size_t length)
62 { 61 {
63 if (!length) 62 if (!length)
64 return; 63 return;
65 64
66 // This should be checking isStopped(), but XMLDocumentParser prematurely 65 // This should be checking isStopped(), but XMLDocumentParser prematurely
67 // stops parsing when handling an XSLT processing instruction and still 66 // stops parsing when handling an XSLT processing instruction and still
68 // needs to receive decoded bytes. 67 // needs to receive decoded bytes.
(...skipping 16 matching lines...) Expand all
85 // We have nothing to do in that case. 84 // We have nothing to do in that case.
86 if (!m_decoder) 85 if (!m_decoder)
87 return; 86 return;
88 87
89 String remainingData = m_decoder->flush(); 88 String remainingData = m_decoder->flush();
90 updateDocument(remainingData); 89 updateDocument(remainingData);
91 } 90 }
92 91
93 void DecodedDataDocumentParser::updateDocument(String& decodedData) 92 void DecodedDataDocumentParser::updateDocument(String& decodedData)
94 { 93 {
95 document()->setEncodingData(DocumentEncodingData(*m_decoder.get())); 94 DocumentEncodingData encodingData;
95 encodingData.encoding = m_decoder->encoding();
96 encodingData.wasDetectedHeuristically = m_decoder->encodingWasDetectedHeuris tically();
97 encodingData.sawDecodingError = m_decoder->sawError();
98 document()->setEncodingData(encodingData);
96 99
97 if (!decodedData.isEmpty()) 100 if (decodedData.isEmpty())
98 append(decodedData.releaseImpl()); 101 return;
102
103 append(decodedData.releaseImpl());
104 // FIXME: Should be removed as part of https://code.google.com/p/chromium/is sues/detail?id=319643
105 if (!m_hasAppendedData) {
106 m_hasAppendedData = true;
107 if (m_decoder->encoding().usesVisualOrdering())
108 document()->setVisuallyOrdered();
109 }
99 } 110 }
100 111
101 }; 112 };
OLDNEW
« no previous file with comments | « Source/core/dom/DecodedDataDocumentParser.h ('k') | Source/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698