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

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

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
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 24 matching lines...) Expand all
35 TextDocumentParser::TextDocumentParser(HTMLDocument* document) 35 TextDocumentParser::TextDocumentParser(HTMLDocument* document)
36 : HTMLDocumentParser(document, false) 36 : HTMLDocumentParser(document, false)
37 , m_haveInsertedFakePreElement(false) 37 , m_haveInsertedFakePreElement(false)
38 { 38 {
39 } 39 }
40 40
41 TextDocumentParser::~TextDocumentParser() 41 TextDocumentParser::~TextDocumentParser()
42 { 42 {
43 } 43 }
44 44
45 void TextDocumentParser::appendBytes(const char* data, size_t length) 45 void TextDocumentParser::append(PassRefPtr<StringImpl> text)
46 { 46 {
47 if (!m_haveInsertedFakePreElement) 47 if (!m_haveInsertedFakePreElement)
48 insertFakePreElement(); 48 insertFakePreElement();
49 HTMLDocumentParser::appendBytes(data, length); 49 HTMLDocumentParser::append(text);
50 } 50 }
51 51
52 void TextDocumentParser::insertFakePreElement() 52 void TextDocumentParser::insertFakePreElement()
53 { 53 {
54 // In principle, we should create a specialized tree builder for 54 // In principle, we should create a specialized tree builder for
55 // TextDocuments, but instead we re-use the existing HTMLTreeBuilder. 55 // TextDocuments, but instead we re-use the existing HTMLTreeBuilder.
56 // We create a fake token and give it to the tree builder rather than 56 // We create a fake token and give it to the tree builder rather than
57 // sending fake bytes through the front-end of the parser to avoid 57 // sending fake bytes through the front-end of the parser to avoid
58 // distrubing the line/column number calculations. 58 // distrubing the line/column number calculations.
59 Vector<Attribute> attributes; 59 Vector<Attribute> attributes;
60 attributes.append(Attribute(styleAttr, "word-wrap: break-word; white-space: pre-wrap;")); 60 attributes.append(Attribute(styleAttr, "word-wrap: break-word; white-space: pre-wrap;"));
61 AtomicHTMLToken fakePre(HTMLToken::StartTag, preTag.localName(), attributes) ; 61 AtomicHTMLToken fakePre(HTMLToken::StartTag, preTag.localName(), attributes) ;
62 treeBuilder()->constructTree(&fakePre); 62 treeBuilder()->constructTree(&fakePre);
63 63
64 // Normally we would skip the first \n after a <pre> element, but we don't 64 // Normally we would skip the first \n after a <pre> element, but we don't
65 // want to skip the first \n for text documents! 65 // want to skip the first \n for text documents!
66 treeBuilder()->setShouldSkipLeadingNewline(false); 66 treeBuilder()->setShouldSkipLeadingNewline(false);
67 67
68 // Although Text Documents expose a "pre" element in their DOM, they 68 // Although Text Documents expose a "pre" element in their DOM, they
69 // act like a <plaintext> tag, so we have to force plaintext mode. 69 // act like a <plaintext> tag, so we have to force plaintext mode.
70 forcePlaintextForTextDocument(); 70 forcePlaintextForTextDocument();
71 71
72 m_haveInsertedFakePreElement = true; 72 m_haveInsertedFakePreElement = true;
73 } 73 }
74 74
75 } 75 }
OLDNEW
« no previous file with comments | « Source/core/html/parser/TextDocumentParser.h ('k') | Source/core/html/parser/TextResourceDecoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698