third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.h - Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue."

Side by Side Diff: third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.h

Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad merge Created 5 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 | « third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp ('k') | third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 169 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
180	180

181 HTMLParserOptions m_options;	181 HTMLParserOptions m_options;

182 HTMLInputStream m_input;	182 HTMLInputStream m_input;

183	183

184 OwnPtr<HTMLToken> m_token;	184 OwnPtr<HTMLToken> m_token;

185 OwnPtr<HTMLTokenizer> m_tokenizer;	185 OwnPtr<HTMLTokenizer> m_tokenizer;

186 OwnPtrWillBeMember<HTMLScriptRunner> m_scriptRunner;	186 OwnPtrWillBeMember<HTMLScriptRunner> m_scriptRunner;

187 OwnPtrWillBeMember<HTMLTreeBuilder> m_treeBuilder;	187 OwnPtrWillBeMember<HTMLTreeBuilder> m_treeBuilder;

188 OwnPtr<HTMLPreloadScanner> m_preloadScanner;	188 OwnPtr<HTMLPreloadScanner> m_preloadScanner;

189 OwnPtr<HTMLPreloadScanner> m_insertionPreloadScanner;	189 OwnPtr<HTMLPreloadScanner> m_insertionPreloadScanner;

190 OwnPtr<WebTaskRunner> m_loadingTaskRunner;

191 OwnPtr<HTMLParserScheduler> m_parserScheduler;	190 OwnPtr<HTMLParserScheduler> m_parserScheduler;

192 HTMLSourceTracker m_sourceTracker;	191 HTMLSourceTracker m_sourceTracker;

193 TextPosition m_textPosition;	192 TextPosition m_textPosition;

194 XSSAuditor m_xssAuditor;	193 XSSAuditor m_xssAuditor;

195 XSSAuditorDelegate m_xssAuditorDelegate;	194 XSSAuditorDelegate m_xssAuditorDelegate;

196	195

197 // FIXME: m_lastChunkBeforeScript, m_tokenizer, m_token, and m_input should be combined into a single state object	196 // FIXME: m_lastChunkBeforeScript, m_tokenizer, m_token, and m_input should be combined into a single state object

198 // so they can be set and cleared together and passed between threads togeth er.	197 // so they can be set and cleared together and passed between threads togeth er.

199 OwnPtr<ParsedChunk> m_lastChunkBeforeScript;	198 OwnPtr<ParsedChunk> m_lastChunkBeforeScript;

200 Deque<OwnPtr<ParsedChunk>> m_speculations;	199 Deque<OwnPtr<ParsedChunk>> m_speculations;

201 WeakPtrFactory<HTMLDocumentParser> m_weakFactory;	200 WeakPtrFactory<HTMLDocumentParser> m_weakFactory;

202 WeakPtr<BackgroundHTMLParser> m_backgroundParser;	201 WeakPtr<BackgroundHTMLParser> m_backgroundParser;

203 OwnPtrWillBeMember<HTMLResourcePreloader> m_preloader;	202 OwnPtrWillBeMember<HTMLResourcePreloader> m_preloader;

204 PreloadRequestStream m_queuedPreloads;	203 PreloadRequestStream m_queuedPreloads;

205	204

206 bool m_shouldUseThreading;	205 bool m_shouldUseThreading;

207 bool m_endWasDelayed;	206 bool m_endWasDelayed;

208 bool m_haveBackgroundParser;	207 bool m_haveBackgroundParser;

209 bool m_tasksWereSuspended;	208 bool m_tasksWereSuspended;

210 unsigned m_pumpSessionNestingLevel;	209 unsigned m_pumpSessionNestingLevel;

211 unsigned m_pumpSpeculationsSessionNestingLevel;	210 unsigned m_pumpSpeculationsSessionNestingLevel;

212 bool m_isParsingAtLineNumber;	211 bool m_isParsingAtLineNumber;

213 };	212 };

214	213

215 }	214 }

216	215

217 #endif	216 #endif

OLD	NEW