<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174579] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174579">174579</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-10-10 02:34:56 -0700 (Fri, 10 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove MainThreadTask
https://bugs.webkit.org/show_bug.cgi?id=137563
Reviewed by Darin Adler.
Replace the remaining uses of MainThreadTask with C++11 lambdas.
Remove the MainThreadTask header from the build.
* WebCore.order:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* platform/MainThreadTask.h: Removed.
* platform/network/curl/CurlDownload.cpp:
(WebCore::CurlDownloadManager::downloadThread):
(WebCore::CurlDownload::didReceiveHeader):
(WebCore::CurlDownload::didReceiveData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp">trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformMainThreadTaskh">trunk/Source/WebCore/platform/MainThreadTask.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174578 => 174579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-10 09:21:17 UTC (rev 174578)
+++ trunk/Source/WebCore/ChangeLog 2014-10-10 09:34:56 UTC (rev 174579)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-10-10 Zan Dobersek <zdobersek@igalia.com>
+
+ Remove MainThreadTask
+ https://bugs.webkit.org/show_bug.cgi?id=137563
+
+ Reviewed by Darin Adler.
+
+ Replace the remaining uses of MainThreadTask with C++11 lambdas.
+ Remove the MainThreadTask header from the build.
+
+ * WebCore.order:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/MainThreadTask.h: Removed.
+ * platform/network/curl/CurlDownload.cpp:
+ (WebCore::CurlDownloadManager::downloadThread):
+ (WebCore::CurlDownload::didReceiveHeader):
+ (WebCore::CurlDownload::didReceiveData):
+
</ins><span class="cx"> 2014-10-10 Andrzej Badowski <a.badowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Changing the mapping of ARIA rowheader and columnheader into respective ATK roles.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (174578 => 174579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2014-10-10 09:21:17 UTC (rev 174578)
+++ trunk/Source/WebCore/WebCore.order 2014-10-10 09:34:56 UTC (rev 174579)
</span><span class="lines">@@ -19541,10 +19541,8 @@
</span><span class="cx"> __ZThn24_N7WebCore10FileReader16derefEventTargetEv
</span><span class="cx"> __ZN7WebCore18BlobResourceHandle12notifyFinishEv
</span><span class="cx"> __ZN7WebCoreL21executeMainThreadTaskEPv
</span><del>-__ZN7WebCore15MainThreadTask1IPNS_15AsyncFileStreamES2_E11performTaskEv
</del><span class="cx"> __ZN7WebCoreL8didStartEPNS_15AsyncFileStreamE
</span><span class="cx"> __ZN7WebCore16FileStreamClient8didStartEv
</span><del>-__ZN7WebCore15MainThreadTask1IPNS_15AsyncFileStreamES2_ED0Ev
</del><span class="cx"> __ZN7WebCoreL14doNotifyFinishEPv
</span><span class="cx"> __ZThn8_N7WebCore18BlobResourceHandleD0Ev
</span><span class="cx"> __ZN7WebCore18BlobResourceHandleD2Ev
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (174578 => 174579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-10-10 09:21:17 UTC (rev 174578)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-10-10 09:34:56 UTC (rev 174579)
</span><span class="lines">@@ -19452,7 +19452,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\LocalizedStrings.h" />
</span><span class="cx"> <ClInclude Include="..\platform\Logging.h" />
</span><span class="cx"> <ClInclude Include="..\platform\MemoryPressureHandler.h" />
</span><del>- <ClInclude Include="..\platform\MainThreadTask.h" />
</del><span class="cx"> <ClInclude Include="..\platform\MIMETypeRegistry.h" />
</span><span class="cx"> <ClInclude Include="..\platform\NotImplemented.h" />
</span><span class="cx"> <ClInclude Include="..\platform\Pasteboard.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (174578 => 174579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-10-10 09:21:17 UTC (rev 174578)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-10-10 09:34:56 UTC (rev 174579)
</span><span class="lines">@@ -8211,9 +8211,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\MemoryPressureHandler.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\platform\MainThreadTask.h">
- <Filter>platform</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\platform\MIMETypeRegistry.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (174578 => 174579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-10 09:21:17 UTC (rev 174578)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-10 09:34:56 UTC (rev 174579)
</span><span class="lines">@@ -5963,7 +5963,6 @@
</span><span class="cx"> E182568F0EF2B02D00933242 /* JSWorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E182568D0EF2B02D00933242 /* JSWorkerGlobalScope.cpp */; };
</span><span class="cx"> E18256900EF2B02D00933242 /* JSWorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = E182568E0EF2B02D00933242 /* JSWorkerGlobalScope.h */; };
</span><span class="cx"> E18258AC0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18258AB0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp */; };
</span><del>- E187056316E54A0D00585E97 /* MainThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = E187056216E54A0D00585E97 /* MainThreadTask.h */; };
</del><span class="cx"> E18772F1126E2629003DD586 /* Language.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18772F0126E2629003DD586 /* Language.cpp */; };
</span><span class="cx"> E18DF33518AAF12C00773E59 /* SerializedCryptoKeyWrap.h in Headers */ = {isa = PBXBuildFile; fileRef = E18DF33418AAF12C00773E59 /* SerializedCryptoKeyWrap.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> E18DF33818AAF14D00773E59 /* SerializedCryptoKeyWrapMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E18DF33618AAF14D00773E59 /* SerializedCryptoKeyWrapMac.mm */; };
</span><span class="lines">@@ -13458,7 +13457,6 @@
</span><span class="cx"> E182568D0EF2B02D00933242 /* JSWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerGlobalScope.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E182568E0EF2B02D00933242 /* JSWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWorkerGlobalScope.h; sourceTree = "<group>"; };
</span><span class="cx"> E18258AB0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerGlobalScopeCustom.cpp; sourceTree = "<group>"; };
</span><del>- E187056216E54A0D00585E97 /* MainThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainThreadTask.h; sourceTree = "<group>"; };
</del><span class="cx"> E18772F0126E2629003DD586 /* Language.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Language.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E18DF33418AAF12C00773E59 /* SerializedCryptoKeyWrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedCryptoKeyWrap.h; sourceTree = "<group>"; };
</span><span class="cx"> E18DF33618AAF14D00773E59 /* SerializedCryptoKeyWrapMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SerializedCryptoKeyWrapMac.mm; path = mac/SerializedCryptoKeyWrapMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -21361,7 +21359,6 @@
</span><span class="cx"> 935207BD09BD410A00F2038D /* LocalizedStrings.h */,
</span><span class="cx"> A8239DFE09B3CF8A00B60641 /* Logging.cpp */,
</span><span class="cx"> A8239DFF09B3CF8A00B60641 /* Logging.h */,
</span><del>- E187056216E54A0D00585E97 /* MainThreadTask.h */,
</del><span class="cx"> CDF2B003181F059C00F2B424 /* MediaDescription.h */,
</span><span class="cx"> CD641EC7181ED60100EE4C41 /* MediaSample.h */,
</span><span class="cx"> 657EDA061385CB97004E0645 /* MemoryPressureHandler.cpp */,
</span><span class="lines">@@ -25275,7 +25272,6 @@
</span><span class="cx"> A8239E0109B3CF8A00B60641 /* Logging.h in Headers */,
</span><span class="cx"> 9BA273F4172206BB0097CE47 /* LogicalSelectionOffsetCaches.h in Headers */,
</span><span class="cx"> 932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */,
</span><del>- E187056316E54A0D00585E97 /* MainThreadTask.h in Headers */,
</del><span class="cx"> 1A8F6BC60DB55CDC001DB794 /* ManifestParser.h in Headers */,
</span><span class="cx"> 7C73FB12191EF6F4007DE061 /* JSUserMessageHandler.h in Headers */,
</span><span class="cx"> 93309DF8099E64920056E581 /* markup.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMainThreadTaskh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/MainThreadTask.h (174578 => 174579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MainThreadTask.h 2014-10-10 09:21:17 UTC (rev 174578)
+++ trunk/Source/WebCore/platform/MainThreadTask.h 2014-10-10 09:34:56 UTC (rev 174579)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009-2010 Google Inc. All rights reserved.
- * Copyright (C) 2013 Apple 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MainThreadTask_h
-#define MainThreadTask_h
-
-#include "CrossThreadCopier.h"
-#include <functional>
-
-namespace WebCore {
-
-class MainThreadTask : public std::function<void ()> {
-public:
- template<typename Method, typename... Parameters>
- MainThreadTask(Method method, const Parameters&... parameters)
- : std::function<void ()>(std::bind(method, typename CrossThreadCopier<Parameters>::Type(CrossThreadCopier<Parameters>::copy(parameters))...))
- {
- }
-};
-
-} // namespace WebCore
-
-
-#endif // MainThreadTask_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (174578 => 174579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2014-10-10 09:21:17 UTC (rev 174578)
+++ trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2014-10-10 09:34:56 UTC (rev 174579)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><span class="cx"> #include "HTTPParsers.h"
</span><del>-#include "MainThreadTask.h"
</del><span class="cx"> #include "ResourceHandleManager.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -214,9 +213,15 @@
</span><span class="cx">
</span><span class="cx"> if (msg->msg == CURLMSG_DONE) {
</span><span class="cx"> if (msg->data.result == CURLE_OK)
</span><del>- callOnMainThread(MainThreadTask(CurlDownload::downloadFinishedCallback, download));
</del><ins>+ callOnMainThread([download] {
+ if (download)
+ download->didFinish();
+ });
</ins><span class="cx"> else
</span><del>- callOnMainThread(MainThreadTask(CurlDownload::downloadFailedCallback, download));
</del><ins>+ callOnMainThread([download] {
+ if (download)
+ download->didFail();
+ });
</ins><span class="cx">
</span><span class="cx"> downloadManager->removeFromCurl(msg->easy_handle);
</span><span class="cx"> }
</span><span class="lines">@@ -400,7 +405,9 @@
</span><span class="cx"> m_response.setMimeType(extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPHeaderName::ContentType)));
</span><span class="cx"> m_response.setTextEncodingName(extractCharsetFromMediaType(m_response.httpHeaderField(HTTPHeaderName::ContentType)));
</span><span class="cx">
</span><del>- callOnMainThread(MainThreadTask(receivedResponseCallback, this));
</del><ins>+ callOnMainThread([this] {
+ didReceiveResponse();
+ });
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> int splitPos = header.find(":");
</span><span class="lines">@@ -413,7 +420,9 @@
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_mutex);
</span><span class="cx">
</span><del>- callOnMainThread(MainThreadTask(receivedDataCallback, this, size));
</del><ins>+ callOnMainThread([this, size] {
+ didReceiveDataOfLength(size);
+ });
</ins><span class="cx">
</span><span class="cx"> writeDataToFile(static_cast<const char*>(data), size);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>