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

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

Issue 657453003: delete useThreading flag as it is always true (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix webkit_unit_tests Created 6 years, 2 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/HTMLParserOptions.cpp ('k') | no next file » | 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 * Copyright (C) 2011, 2014 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 2095 matching lines...) Expand 10 before | Expand all | Expand 10 after
2106 // Pause ourselves so that parsing stops until the script can be pro cessed by the caller. 2106 // Pause ourselves so that parsing stops until the script can be pro cessed by the caller.
2107 ASSERT(m_tree.currentStackItem()->hasTagName(scriptTag)); 2107 ASSERT(m_tree.currentStackItem()->hasTagName(scriptTag));
2108 if (scriptingContentIsAllowed(m_tree.parserContentPolicy())) 2108 if (scriptingContentIsAllowed(m_tree.parserContentPolicy()))
2109 m_scriptToProcess = m_tree.currentElement(); 2109 m_scriptToProcess = m_tree.currentElement();
2110 m_tree.openElements()->pop(); 2110 m_tree.openElements()->pop();
2111 setInsertionMode(m_originalInsertionMode); 2111 setInsertionMode(m_originalInsertionMode);
2112 2112
2113 if (m_parser->tokenizer()) { 2113 if (m_parser->tokenizer()) {
2114 // We must set the tokenizer's state to 2114 // We must set the tokenizer's state to
2115 // DataState explicitly if the tokenizer didn't have a chance to . 2115 // DataState explicitly if the tokenizer didn't have a chance to .
2116 ASSERT(m_parser->tokenizer()->state() == HTMLTokenizer::DataStat e || m_options.useThreading);
2117 m_parser->tokenizer()->setState(HTMLTokenizer::DataState); 2116 m_parser->tokenizer()->setState(HTMLTokenizer::DataState);
2118 } 2117 }
2119 return; 2118 return;
2120 } 2119 }
2121 m_tree.openElements()->pop(); 2120 m_tree.openElements()->pop();
2122 setInsertionMode(m_originalInsertionMode); 2121 setInsertionMode(m_originalInsertionMode);
2123 break; 2122 break;
2124 case InFramesetMode: 2123 case InFramesetMode:
2125 ASSERT(insertionMode() == InFramesetMode); 2124 ASSERT(insertionMode() == InFramesetMode);
2126 if (token->name() == framesetTag) { 2125 if (token->name() == framesetTag) {
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
2805 ASSERT(m_isAttached); 2804 ASSERT(m_isAttached);
2806 // Warning, this may detach the parser. Do not do anything else after this. 2805 // Warning, this may detach the parser. Do not do anything else after this.
2807 m_tree.finishedParsing(); 2806 m_tree.finishedParsing();
2808 } 2807 }
2809 2808
2810 void HTMLTreeBuilder::parseError(AtomicHTMLToken*) 2809 void HTMLTreeBuilder::parseError(AtomicHTMLToken*)
2811 { 2810 {
2812 } 2811 }
2813 2812
2814 } // namespace blink 2813 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/parser/HTMLParserOptions.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698