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

Side by Side Diff: Source/WebCore/html/parser/HTMLDocumentParser.cpp

Issue 7155003: Merge 88411 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 if (!isParsingFragment()) { 268 if (!isParsingFragment()) {
269 m_sourceTracker.end(m_input, m_token); 269 m_sourceTracker.end(m_input, m_token);
270 270
271 // We do not XSS filter innerHTML, which means we (intentionally) fa il 271 // We do not XSS filter innerHTML, which means we (intentionally) fa il
272 // http/tests/security/xssAuditor/dom-write-innerHTML.html 272 // http/tests/security/xssAuditor/dom-write-innerHTML.html
273 m_xssFilter.filterToken(m_token); 273 m_xssFilter.filterToken(m_token);
274 } 274 }
275 275
276 m_treeBuilder->constructTreeFromToken(m_token); 276 m_treeBuilder->constructTreeFromToken(m_token);
277 m_token.clear(); 277 ASSERT(m_token.isUninitialized());
278 } 278 }
279 279
280 // Ensure we haven't been totally deref'ed after pumping. Any caller of this 280 // Ensure we haven't been totally deref'ed after pumping. Any caller of this
281 // function should be holding a RefPtr to this to ensure we weren't deleted. 281 // function should be holding a RefPtr to this to ensure we weren't deleted.
282 ASSERT(refCount() >= 1); 282 ASSERT(refCount() >= 1);
283 283
284 if (isStopped()) 284 if (isStopped())
285 return; 285 return;
286 286
287 if (session.needsYield) 287 if (session.needsYield)
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 m_parserScheduler->suspend(); 576 m_parserScheduler->suspend();
577 } 577 }
578 578
579 void HTMLDocumentParser::resumeScheduledTasks() 579 void HTMLDocumentParser::resumeScheduledTasks()
580 { 580 {
581 if (m_parserScheduler) 581 if (m_parserScheduler)
582 m_parserScheduler->resume(); 582 m_parserScheduler->resume();
583 } 583 }
584 584
585 } 585 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/parser/document-write-onload-ordering-expected.txt ('k') | Source/WebCore/html/parser/HTMLToken.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698