<!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>[38650] trunk/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/38650">38650</a></dd>
<dt>Author</dt> <dd>adele@apple.com</dd>
<dt>Date</dt> <dd>2008-11-20 17:54:55 -0800 (Thu, 20 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-11-20  Adele Peterson  &lt;adele@apple.com&gt;

        Reviewed by Darin Adler. 

        Fix for &lt;rdar://problem/6111436&gt; Support upload progress events on Windows

        * platform/network/cf/ResourceHandleCFNet.cpp:
        (WebCore::didSendBodyData): Added.
        (WebCore::ResourceHandle::start): Hook up didSendBodyData callback.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (38649 => 38650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-11-21 01:53:44 UTC (rev 38649)
+++ trunk/WebCore/ChangeLog        2008-11-21 01:54:55 UTC (rev 38650)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2008-11-20  Adele Peterson  &lt;adele@apple.com&gt;
+
+        Reviewed by Darin Adler. 
+
+        Fix for &lt;rdar://problem/6111436&gt; Support upload progress events on Windows
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::didSendBodyData): Added.
+        (WebCore::ResourceHandle::start): Hook up didSendBodyData callback.
+
</ins><span class="cx"> 2008-11-20  Justin Garcia  &lt;justin.garcia@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (38649 => 38650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp        2008-11-21 01:53:44 UTC (rev 38649)
+++ trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp        2008-11-21 01:54:55 UTC (rev 38650)
</span><span class="lines">@@ -109,6 +109,16 @@
</span><span class="cx">         handle-&gt;client()-&gt;didReceiveData(handle, (const char*)bytes, length, originalLength);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#ifdef _CFURLConnectionClientV2Present
+static void didSendBodyData(CFURLConnectionRef conn, CFIndex bytesWritten, CFIndex totalBytesWritten, CFIndex totalBytesExpectedToWrite, const void *clientInfo)
+{
+    ResourceHandle* handle = (ResourceHandle*)clientInfo;
+    if (!handle || !handle-&gt;client())
+        return;
+    handle-&gt;client()-&gt;didSendData(handle, totalBytesWritten, totalBytesExpectedToWrite);
+}
+#endif
+
</ins><span class="cx"> void didFinishLoading(CFURLConnectionRef conn, const void* clientInfo) 
</span><span class="cx"> {
</span><span class="cx">     ResourceHandle* handle = (ResourceHandle*)clientInfo;
</span><span class="lines">@@ -279,11 +289,17 @@
</span><span class="cx"> 
</span><span class="cx">     RetainPtr&lt;CFURLRequestRef&gt; request(AdoptCF, makeFinalRequest(d-&gt;m_request, d-&gt;m_shouldContentSniff));
</span><span class="cx"> 
</span><del>-    // CFURLConnection Callback API currently at version 1
-    const int CFURLConnectionClientVersion = 1;
-    CFURLConnectionClient client = {CFURLConnectionClientVersion, this, 0, 0, 0, willSendRequest, didReceiveResponse, didReceiveData, NULL, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge};
</del><ins>+    CFURLConnectionClient* client;
+#ifdef _CFURLConnectionClientV2Present
+    // CFURLConnection Callback API currently at version 2
+    CFURLConnectionClient_V2 client_V2 = {2, this, 0, 0, 0, willSendRequest, didReceiveResponse, didReceiveData, NULL, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData};
+    client = reinterpret_cast&lt;CFURLConnectionClient*&gt;(&amp;client_V2);
+#else
+    CFURLConnectionClient client_V1 = {1, this, 0, 0, 0, willSendRequest, didReceiveResponse, didReceiveData, NULL, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge};
+    client = &amp;client_V1;
+#endif
</ins><span class="cx"> 
</span><del>-    d-&gt;m_connection.adoptCF(CFURLConnectionCreate(0, request.get(), &amp;client));
</del><ins>+    d-&gt;m_connection.adoptCF(CFURLConnectionCreate(0, request.get(), client));
</ins><span class="cx"> 
</span><span class="cx">     CFURLConnectionScheduleWithCurrentMessageQueue(d-&gt;m_connection.get());
</span><span class="cx">     CFURLConnectionScheduleDownloadWithRunLoop(d-&gt;m_connection.get(), loaderRunLoop(), kCFRunLoopDefaultMode);
</span></span></pre>
</div>
</div>

</body>
</html>