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

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

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5
Patch Set: get-names-6: . Created 4 years, 9 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) 2013 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2013 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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 277
278 #if ENABLE(ASSERT) 278 #if ENABLE(ASSERT)
279 checkThatTokensAreSafeToSendToAnotherThread(m_pendingTokens.get()); 279 checkThatTokensAreSafeToSendToAnotherThread(m_pendingTokens.get());
280 checkThatPreloadsAreSafeToSendToAnotherThread(m_pendingPreloads); 280 checkThatPreloadsAreSafeToSendToAnotherThread(m_pendingPreloads);
281 checkThatXSSInfosAreSafeToSendToAnotherThread(m_pendingXSSInfos); 281 checkThatXSSInfosAreSafeToSendToAnotherThread(m_pendingXSSInfos);
282 #endif 282 #endif
283 283
284 OwnPtr<HTMLDocumentParser::ParsedChunk> chunk = adoptPtr(new HTMLDocumentPar ser::ParsedChunk); 284 OwnPtr<HTMLDocumentParser::ParsedChunk> chunk = adoptPtr(new HTMLDocumentPar ser::ParsedChunk);
285 chunk->preloads.swap(m_pendingPreloads); 285 chunk->preloads.swap(m_pendingPreloads);
286 chunk->xssInfos.swap(m_pendingXSSInfos); 286 chunk->xssInfos.swap(m_pendingXSSInfos);
287 chunk->tokenizerState = m_tokenizer->state(); 287 chunk->tokenizerState = m_tokenizer->getState();
288 chunk->treeBuilderState = m_treeBuilderSimulator.state(); 288 chunk->treeBuilderState = m_treeBuilderSimulator.state();
289 chunk->inputCheckpoint = m_input.createCheckpoint(m_pendingTokens->size()); 289 chunk->inputCheckpoint = m_input.createCheckpoint(m_pendingTokens->size());
290 chunk->preloadScannerCheckpoint = m_preloadScanner->createCheckpoint(); 290 chunk->preloadScannerCheckpoint = m_preloadScanner->createCheckpoint();
291 chunk->tokens = m_pendingTokens.release(); 291 chunk->tokens = m_pendingTokens.release();
292 chunk->startingScript = m_startingScript; 292 chunk->startingScript = m_startingScript;
293 m_startingScript = false; 293 m_startingScript = false;
294 294
295 bool isEmpty = m_parsedChunkQueue->enqueue(chunk.release()); 295 bool isEmpty = m_parsedChunkQueue->enqueue(chunk.release());
296 if (isEmpty) { 296 if (isEmpty) {
297 m_loadingTaskRunner->postTask( 297 m_loadingTaskRunner->postTask(
298 BLINK_FROM_HERE, 298 BLINK_FROM_HERE,
299 new Task(threadSafeBind(&HTMLDocumentParser::notifyPendingParsedChun ks, AllowCrossThreadAccess(m_parser)))); 299 new Task(threadSafeBind(&HTMLDocumentParser::notifyPendingParsedChun ks, AllowCrossThreadAccess(m_parser))));
300 } 300 }
301 301
302 m_pendingTokens = adoptPtr(new CompactHTMLTokenStream); 302 m_pendingTokens = adoptPtr(new CompactHTMLTokenStream);
303 } 303 }
304 304
305 } // namespace blink 305 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698