Remove threading primitives from ParseHTMLOnMainThread

third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp

 /*
  * Copyright (C) 2013 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 141 matching lines @@
 }
 
 void BackgroundHTMLParser::updateDocument(const String& decodedData)
 {
     DocumentEncodingData encodingData(*m_decoder.get());
 
     if (encodingData != m_lastSeenEncodingData) {
         m_lastSeenEncodingData = encodingData;
 
         m_xssAuditor->setEncoding(encodingData.encoding());
-        runOnMainThread(crossThreadBind(&HTMLDocumentParser::didReceiveEncodingDataFromBackgroundParser, m_parser, encodingData));
+        runOnMainThread(&HTMLDocumentParser::didReceiveEncodingDataFromBackgroundParser, m_parser, encodingData);
     }
 
     if (decodedData.isEmpty())
         return;
 
     appendDecodedBytes(decodedData);
 }
 
 void BackgroundHTMLParser::resumeFrom(std::unique_ptr<Checkpoint> checkpoint)
 {
@@ skipping 137 matching lines @@
     chunk->startingScript = m_startingScript;
     chunk->likelyDocumentWriteScriptIndices.swap(m_likelyDocumentWriteScriptIndices);
     m_startingScript = false;
 
     bool isEmpty = m_parsedChunkQueue->enqueue(std::move(chunk));
 
     DEFINE_STATIC_LOCAL(CustomCountHistogram, chunkEnqueueTime, ("Parser.ChunkEnqueueTime", 1, 10000, 50));
     chunkEnqueueTime.count(monotonicallyIncreasingTimeMS() - chunkStartTime);
 
     if (isEmpty) {
-        runOnMainThread(crossThreadBind(&HTMLDocumentParser::notifyPendingParsedChunks, m_parser));
+        runOnMainThread(&HTMLDocumentParser::notifyPendingParsedChunks, m_parser);
     }
 
     m_pendingTokens = wrapUnique(new CompactHTMLTokenStream);
 }
 
 // If the background parser is already running on the main thread, then it is
 // not necessary to post a task to the main thread to run asynchronously. The
 // main parser deals with chunking up its own work.
 // TODO(csharrison): This is a pretty big hack because we don't actually need a
 // CrossThreadClosure in these cases. This is just experimental.
-void BackgroundHTMLParser::runOnMainThread(std::unique_ptr<CrossThreadClosure> closure)
+template <typename FunctionType, typename... Ps>
+void BackgroundHTMLParser::runOnMainThread(FunctionType function, Ps&&... parameters)
 {
-    if (isMainThread())
-        (*closure)();
-    else
-        m_loadingTaskRunner->postTask(BLINK_FROM_HERE, std::move(closure));
+    if (isMainThread()) {
+        (*WTF::bind(function, std::forward<Ps>(parameters)...))();
+    } else {
+        m_loadingTaskRunner->postTask(BLINK_FROM_HERE, crossThreadBind(function, std::forward<Ps>(parameters)...));
+    }
 }
 
 } // namespace blink