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

Side by Side Diff: Source/core/html/parser/HTMLViewSourceParser.cpp

Issue 74513003: Moved text decoding to the parser thread (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@parserthread_step25
Patch Set: Removed AtomicString from HTMLMetaCharsetParser 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
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/html/parser/HTMLViewSourceParser.h" 27 #include "core/html/parser/HTMLViewSourceParser.h"
28 28
29 #include "core/dom/DOMImplementation.h" 29 #include "core/dom/DOMImplementation.h"
30 #include "core/html/HTMLViewSourceDocument.h" 30 #include "core/html/HTMLViewSourceDocument.h"
31 #include "core/html/parser/HTMLIdentifier.h"
31 #include "core/html/parser/HTMLParserOptions.h" 32 #include "core/html/parser/HTMLParserOptions.h"
32 #include "core/html/parser/HTMLToken.h" 33 #include "core/html/parser/HTMLToken.h"
33 34
34 namespace WebCore { 35 namespace WebCore {
35 36
36 HTMLViewSourceParser::HTMLViewSourceParser(HTMLViewSourceDocument* document, con st String& mimeType) 37 HTMLViewSourceParser::HTMLViewSourceParser(HTMLViewSourceDocument* document, con st String& mimeType)
37 : DecodedDataDocumentParser(document) 38 : DecodedDataDocumentParser(document)
38 , m_tokenizer(HTMLTokenizer::create(HTMLParserOptions(document))) 39 , m_tokenizer(HTMLTokenizer::create(HTMLParserOptions(document)))
39 { 40 {
40 if (mimeType != "text/html" && !DOMImplementation::isXMLMIMEType(mimeType)) 41 if (mimeType != "text/html" && !DOMImplementation::isXMLMIMEType(mimeType))
41 m_tokenizer->setState(HTMLTokenizer::PLAINTEXTState); 42 m_tokenizer->setState(HTMLTokenizer::PLAINTEXTState);
42 } 43 }
43 44
44 void HTMLViewSourceParser::pumpTokenizer() 45 void HTMLViewSourceParser::pumpTokenizer()
45 { 46 {
46 while (true) { 47 while (true) {
47 m_sourceTracker.start(m_input.current(), m_tokenizer.get(), m_token); 48 m_sourceTracker.start(m_input.current(), m_tokenizer.get(), m_token);
48 if (!m_tokenizer->nextToken(m_input.current(), m_token)) 49 if (!m_tokenizer->nextToken(m_input.current(), m_token))
49 return; 50 return;
50 m_sourceTracker.end(m_input.current(), m_tokenizer.get(), m_token); 51 m_sourceTracker.end(m_input.current(), m_tokenizer.get(), m_token);
51 52
52 document()->addSource(m_sourceTracker.sourceForToken(m_token), m_token); 53 document()->addSource(m_sourceTracker.sourceForToken(m_token), m_token);
53 54
54 // FIXME: The tokenizer should do this work for us. 55 // FIXME: The tokenizer should do this work for us.
55 if (m_token.type() == HTMLToken::StartTag) 56 if (m_token.type() == HTMLToken::StartTag)
56 m_tokenizer->updateStateFor(AtomicString(m_token.name())); 57 m_tokenizer->updateStateFor(HTMLIdentifier(m_token.name(), Likely8Bi t));
57 m_token.clear(); 58 m_token.clear();
58 } 59 }
59 } 60 }
60 61
61 void HTMLViewSourceParser::append(PassRefPtr<StringImpl> input) 62 void HTMLViewSourceParser::append(PassRefPtr<StringImpl> input)
62 { 63 {
63 m_input.appendToEnd(String(input)); 64 m_input.appendToEnd(String(input));
64 pumpTokenizer(); 65 pumpTokenizer();
65 } 66 }
66 67
67 void HTMLViewSourceParser::finish() 68 void HTMLViewSourceParser::finish()
68 { 69 {
69 if (!m_input.haveSeenEndOfFile()) 70 if (!m_input.haveSeenEndOfFile())
70 m_input.markEndOfFile(); 71 m_input.markEndOfFile();
71 pumpTokenizer(); 72 pumpTokenizer();
72 document()->finishedParsing(); 73 document()->finishedParsing();
73 } 74 }
74 75
75 } 76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698