<!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>[168626] 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/168626">168626</a></dd>

<dt>Author</dt> <dd>commit-queue@webkit.org</dd>

<dt>Date</dt> <dd>2014-05-12 11:00:58 -0700 (Mon, 12 May 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>WinCairo buildfix after <a href="http://trac.webkit.org/projects/webkit/changeset/168611">r168611</a>

https://bugs.webkit.org/show_bug.cgi?id=132825

Patch by Jozsef Berta &lt;jberta.u-szeged@partner.samsung.com&gt; on 2014-05-12

Reviewed by Darin Adler.

* 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="#trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp">trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168625 => 168626)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-05-12 17:56:42 UTC (rev 168625)

+++ trunk/Source/WebCore/ChangeLog        2014-05-12 18:00:58 UTC (rev 168626)

</span><span class="lines">@@ -1,3 +1,15 @@

</span><ins>+2014-05-12  Jozsef Berta  &lt;jberta.u-szeged@partner.samsung.com&gt;

+

+        WinCairo buildfix after r168611

+        https://bugs.webkit.org/show_bug.cgi?id=132825

+

+        Reviewed by Darin Adler.

+

+        * platform/network/curl/CurlDownload.cpp:

+        (WebCore::CurlDownloadManager::downloadThread):

+        (WebCore::CurlDownload::didReceiveHeader):

+        (WebCore::CurlDownload::didReceiveData):

+

</ins><span class="cx"> 2014-05-12  Antti Koivisto  &lt;antti@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         REGRESSION (r159560): Text clips on tile border if line-height &lt; font-size

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (168625 => 168626)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp        2014-05-12 17:56:42 UTC (rev 168625)

+++ trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp        2014-05-12 18:00:58 UTC (rev 168626)

</span><span class="lines">@@ -213,9 +213,9 @@

</span><span class="cx"> 

</span><span class="cx">         if (msg-&gt;msg == CURLMSG_DONE) {

</span><span class="cx">             if (msg-&gt;data.result == CURLE_OK)

</span><del>-                callOnMainThread&lt;CurlDownload*, CurlDownload*&gt;(CurlDownload::downloadFinishedCallback, download);

</del><ins>+                callOnMainThread(MainThreadTask(CurlDownload::downloadFinishedCallback, download));

</ins><span class="cx">             else

</span><del>-                callOnMainThread&lt;CurlDownload*, CurlDownload*&gt;(CurlDownload::downloadFailedCallback, download);

</del><ins>+                callOnMainThread(MainThreadTask(CurlDownload::downloadFailedCallback, download));

</ins><span class="cx"> 

</span><span class="cx">             downloadManager-&gt;removeFromCurl(msg-&gt;easy_handle);

</span><span class="cx">         }

</span><span class="lines">@@ -400,7 +400,7 @@

</span><span class="cx">             m_response.setTextEncodingName(extractCharsetFromMediaType(m_response.httpHeaderField(&quot;Content-Type&quot;)));

</span><span class="cx">             m_response.setSuggestedFilename(filenameFromHTTPContentDisposition(m_response.httpHeaderField(&quot;Content-Disposition&quot;)));

</span><span class="cx"> 

</span><del>-            callOnMainThread&lt;CurlDownload*, CurlDownload*&gt;(receivedResponseCallback, this);

</del><ins>+            callOnMainThread(MainThreadTask(receivedResponseCallback, this));

</ins><span class="cx">         }

</span><span class="cx">     } else {

</span><span class="cx">         int splitPos = header.find(&quot;:&quot;);

</span><span class="lines">@@ -413,7 +413,7 @@

</span><span class="cx"> {

</span><span class="cx">     MutexLocker locker(m_mutex);

</span><span class="cx"> 

</span><del>-    callOnMainThread&lt;CurlDownload*, CurlDownload*, int, int&gt;(receivedDataCallback, this, size);

</del><ins>+    callOnMainThread(MainThreadTask(receivedDataCallback, this, size));

</ins><span class="cx"> 

</span><span class="cx">     writeDataToFile(static_cast&lt;const char*&gt;(data), size);

</span><span class="cx"> }

</span></span></pre>

</div>

</div>

</body>

</html>