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

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

Issue 141143007: Revert of Revert "Moved text decoding to the parser thread" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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/html/parser/HTMLTokenizer.cpp ('k') | Source/core/html/parser/TextDocumentParser.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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
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/parser/HTMLParserIdioms.h"
30 #include "core/html/parser/HTMLParserOptions.h" 31 #include "core/html/parser/HTMLParserOptions.h"
31 #include "core/html/parser/HTMLToken.h" 32 #include "core/html/parser/HTMLToken.h"
32 33
33 namespace WebCore { 34 namespace WebCore {
34 35
35 HTMLViewSourceParser::HTMLViewSourceParser(HTMLViewSourceDocument* document, con st String& mimeType) 36 HTMLViewSourceParser::HTMLViewSourceParser(HTMLViewSourceDocument* document, con st String& mimeType)
36 : DecodedDataDocumentParser(document) 37 : DecodedDataDocumentParser(document)
37 , m_tokenizer(HTMLTokenizer::create(HTMLParserOptions(document))) 38 , m_tokenizer(HTMLTokenizer::create(HTMLParserOptions(document)))
38 { 39 {
39 if (mimeType != "text/html" && !DOMImplementation::isXMLMIMEType(mimeType)) 40 if (mimeType != "text/html" && !DOMImplementation::isXMLMIMEType(mimeType))
40 m_tokenizer->setState(HTMLTokenizer::PLAINTEXTState); 41 m_tokenizer->setState(HTMLTokenizer::PLAINTEXTState);
41 } 42 }
42 43
43 void HTMLViewSourceParser::pumpTokenizer() 44 void HTMLViewSourceParser::pumpTokenizer()
44 { 45 {
45 while (true) { 46 while (true) {
46 m_sourceTracker.start(m_input.current(), m_tokenizer.get(), m_token); 47 m_sourceTracker.start(m_input.current(), m_tokenizer.get(), m_token);
47 if (!m_tokenizer->nextToken(m_input.current(), m_token)) 48 if (!m_tokenizer->nextToken(m_input.current(), m_token))
48 return; 49 return;
49 m_sourceTracker.end(m_input.current(), m_tokenizer.get(), m_token); 50 m_sourceTracker.end(m_input.current(), m_tokenizer.get(), m_token);
50 51
51 document()->addSource(m_sourceTracker.sourceForToken(m_token), m_token); 52 document()->addSource(m_sourceTracker.sourceForToken(m_token), m_token);
52 53
53 // FIXME: The tokenizer should do this work for us. 54 // FIXME: The tokenizer should do this work for us.
54 if (m_token.type() == HTMLToken::StartTag) 55 if (m_token.type() == HTMLToken::StartTag)
55 m_tokenizer->updateStateFor(AtomicString(m_token.name())); 56 m_tokenizer->updateStateFor(attemptStaticStringCreation(m_token.name (), Likely8Bit));
56 m_token.clear(); 57 m_token.clear();
57 } 58 }
58 } 59 }
59 60
60 void HTMLViewSourceParser::append(PassRefPtr<StringImpl> input) 61 void HTMLViewSourceParser::append(PassRefPtr<StringImpl> input)
61 { 62 {
62 m_input.appendToEnd(String(input)); 63 m_input.appendToEnd(String(input));
63 pumpTokenizer(); 64 pumpTokenizer();
64 } 65 }
65 66
66 void HTMLViewSourceParser::finish() 67 void HTMLViewSourceParser::finish()
67 { 68 {
68 if (!m_input.haveSeenEndOfFile()) 69 if (!m_input.haveSeenEndOfFile())
69 m_input.markEndOfFile(); 70 m_input.markEndOfFile();
70 pumpTokenizer(); 71 pumpTokenizer();
71 document()->finishedParsing(); 72 document()->finishedParsing();
72 } 73 }
73 74
74 } 75 }
OLDNEW
« no previous file with comments | « Source/core/html/parser/HTMLTokenizer.cpp ('k') | Source/core/html/parser/TextDocumentParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698