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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 12 matching lines...) Expand all
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 "core/html/parser/HTMLViewSourceParser.h" 26 #include "core/html/parser/HTMLViewSourceParser.h"
27 27
28 #include "core/dom/DOMImplementation.h" 28 #include "core/dom/DOMImplementation.h"
29 #include "core/html/parser/HTMLParserIdioms.h" 29 #include "core/html/parser/HTMLParserIdioms.h"
30 #include "core/html/parser/HTMLParserOptions.h" 30 #include "core/html/parser/HTMLParserOptions.h"
31 #include "core/html/parser/HTMLToken.h" 31 #include "core/html/parser/HTMLToken.h"
32 #include "core/html/parser/XSSAuditorDelegate.h" 32 #include "core/html/parser/XSSAuditorDelegate.h"
33 #include <memory>
33 34
34 namespace blink { 35 namespace blink {
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 m_xssAuditor.init(document(), 0); 47 m_xssAuditor.init(document(), 0);
47 48
48 while (true) { 49 while (true) {
49 m_sourceTracker.start(m_input.current(), m_tokenizer.get(), m_token); 50 m_sourceTracker.start(m_input.current(), m_tokenizer.get(), m_token);
50 if (!m_tokenizer->nextToken(m_input.current(), m_token)) 51 if (!m_tokenizer->nextToken(m_input.current(), m_token))
51 return; 52 return;
52 m_sourceTracker.end(m_input.current(), m_tokenizer.get(), m_token); 53 m_sourceTracker.end(m_input.current(), m_tokenizer.get(), m_token);
53 54
54 OwnPtr<XSSInfo> xssInfo = m_xssAuditor.filterToken(FilterTokenRequest(m_ token, m_sourceTracker, m_tokenizer->shouldAllowCDATA())); 55 std::unique_ptr<XSSInfo> xssInfo = m_xssAuditor.filterToken(FilterTokenR equest(m_token, m_sourceTracker, m_tokenizer->shouldAllowCDATA()));
55 HTMLViewSourceDocument::SourceAnnotation annotation = xssInfo ? HTMLView SourceDocument::AnnotateSourceAsXSS : HTMLViewSourceDocument::AnnotateSourceAsSa fe; 56 HTMLViewSourceDocument::SourceAnnotation annotation = xssInfo ? HTMLView SourceDocument::AnnotateSourceAsXSS : HTMLViewSourceDocument::AnnotateSourceAsSa fe;
56 document()->addSource(m_sourceTracker.sourceForToken(m_token), m_token, annotation); 57 document()->addSource(m_sourceTracker.sourceForToken(m_token), m_token, annotation);
57 58
58 // FIXME: The tokenizer should do this work for us. 59 // FIXME: The tokenizer should do this work for us.
59 if (m_token.type() == HTMLToken::StartTag) 60 if (m_token.type() == HTMLToken::StartTag)
60 m_tokenizer->updateStateFor(attemptStaticStringCreation(m_token.name (), Likely8Bit)); 61 m_tokenizer->updateStateFor(attemptStaticStringCreation(m_token.name (), Likely8Bit));
61 m_token.clear(); 62 m_token.clear();
62 } 63 }
63 } 64 }
64 65
65 void HTMLViewSourceParser::append(const String& input) 66 void HTMLViewSourceParser::append(const String& input)
66 { 67 {
67 m_input.appendToEnd(input); 68 m_input.appendToEnd(input);
68 pumpTokenizer(); 69 pumpTokenizer();
69 } 70 }
70 71
71 void HTMLViewSourceParser::finish() 72 void HTMLViewSourceParser::finish()
72 { 73 {
73 if (!m_input.haveSeenEndOfFile()) 74 if (!m_input.haveSeenEndOfFile())
74 m_input.markEndOfFile(); 75 m_input.markEndOfFile();
75 pumpTokenizer(); 76 pumpTokenizer();
76 document()->finishedParsing(); 77 document()->finishedParsing();
77 } 78 }
78 79
79 } // namespace blink 80 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698