<!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>[37616] 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/37616">37616</a></dd>
<dt>Author</dt> <dd>adele@apple.com</dd>
<dt>Date</dt> <dd>2008-10-15 14:53:46 -0700 (Wed, 15 Oct 2008)</dd>
</dl>

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

        Reviewed by Sam Weinig.

        Implement didSendBodyData delegate method, and use older code path when that delegate doesn't exist. 

        * platform/network/ResourceHandle.h:
        * platform/network/mac/FormDataStreamMac.mm: (WebCore::formRead):
        * platform/network/mac/ResourceHandleMac.mm:
        (WebCore::ResourceHandle::didSendBodyDataDelegateExists):
        (WebCore::ResourceHandle::start):
        (WebCore::ResourceHandle::cancel):
        (-[WebCoreResourceHandleAsDelegate connection:willSendRequest:redirectResponse:]):
        (-[WebCoreResourceHandleAsDelegate connection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:]):
        (-[WebCoreResourceHandleAsDelegate connectionDidFinishLoading:]):
        (-[WebCoreResourceHandleAsDelegate connection:didFailWithError:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformnetworkResourceHandleh">trunk/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkWebCoreplatformnetworkmacFormDataStreamMacmm">trunk/WebCore/platform/network/mac/FormDataStreamMac.mm</a></li>
<li><a href="#trunkWebCoreplatformnetworkmacResourceHandleMacmm">trunk/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37615 => 37616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-15 21:11:23 UTC (rev 37615)
+++ trunk/WebCore/ChangeLog        2008-10-15 21:53:46 UTC (rev 37616)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2008-10-15  Adele Peterson  &lt;adele@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+
+        Implement didSendBodyData delegate method, and use older code path when that delegate doesn't exist. 
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/mac/FormDataStreamMac.mm: (WebCore::formRead):
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::didSendBodyDataDelegateExists):
+        (WebCore::ResourceHandle::start):
+        (WebCore::ResourceHandle::cancel):
+        (-[WebCoreResourceHandleAsDelegate connection:willSendRequest:redirectResponse:]):
+        (-[WebCoreResourceHandleAsDelegate connection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:]):
+        (-[WebCoreResourceHandleAsDelegate connectionDidFinishLoading:]):
+        (-[WebCoreResourceHandleAsDelegate connection:didFailWithError:]):
+
</ins><span class="cx"> 2008-10-15  Peter Kasting  &lt;pkasting@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Hyatt.
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/ResourceHandle.h (37615 => 37616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/ResourceHandle.h        2008-10-15 21:11:23 UTC (rev 37615)
+++ trunk/WebCore/platform/network/ResourceHandle.h        2008-10-15 21:53:46 UTC (rev 37616)
</span><span class="lines">@@ -103,7 +103,10 @@
</span><span class="cx"> 
</span><span class="cx">     static void loadResourceSynchronously(const ResourceRequest&amp;, ResourceError&amp;, ResourceResponse&amp;, Vector&lt;char&gt;&amp; data, Frame* frame);
</span><span class="cx">     static bool willLoadFromCache(ResourceRequest&amp;);
</span><del>-    
</del><ins>+#if PLATFORM(MAC)
+    static bool didSendBodyDataDelegateExists();
+#endif
+
</ins><span class="cx">     ~ResourceHandle();
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC) || USE(CFNETWORK) || USE(CURL)
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkmacFormDataStreamMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/mac/FormDataStreamMac.mm (37615 => 37616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/mac/FormDataStreamMac.mm        2008-10-15 21:11:23 UTC (rev 37615)
+++ trunk/WebCore/platform/network/mac/FormDataStreamMac.mm        2008-10-15 21:53:46 UTC (rev 37616)
</span><span class="lines">@@ -249,9 +249,11 @@
</span><span class="cx">             *atEOF = FALSE;
</span><span class="cx">             form-&gt;bytesSent += bytesRead;
</span><span class="cx"> 
</span><del>-            // FIXME: Figure out how to only do this when a ResourceHandleClient is available.
-            DidSendDataCallbackData* data = new DidSendDataCallbackData(stream, form-&gt;bytesSent, form-&gt;streamLength);
-            callOnMainThread(performDidSendDataCallback, data);
</del><ins>+            if (!ResourceHandle::didSendBodyDataDelegateExists()) {
+                // FIXME: Figure out how to only do this when a ResourceHandleClient is available.
+                DidSendDataCallbackData* data = new DidSendDataCallbackData(stream, form-&gt;bytesSent, form-&gt;streamLength);
+                callOnMainThread(performDidSendDataCallback, data);
+            }
</ins><span class="cx"> 
</span><span class="cx">             return bytesRead;
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/mac/ResourceHandleMac.mm (37615 => 37616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/mac/ResourceHandleMac.mm        2008-10-15 21:11:23 UTC (rev 37615)
+++ trunk/WebCore/platform/network/mac/ResourceHandleMac.mm        2008-10-15 21:53:46 UTC (rev 37616)
</span><span class="lines">@@ -109,6 +109,17 @@
</span><span class="cx">     releaseDelegate();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static const double MaxFoundationVersionWithoutdidSendBodyDataDelegate = 677.21;
+bool ResourceHandle::didSendBodyDataDelegateExists()
+{
+// FIXME: Refine this check as the delegate becomes more widely available.
+#ifdef BUILDING_ON_LEOPARD
+    return NSFoundationVersionNumber &gt; MaxFoundationVersionWithoutdidSendBodyDataDelegate;
+#else
+    return false;
+#endif
+}
+
</ins><span class="cx"> bool ResourceHandle::start(Frame* frame)
</span><span class="cx"> {
</span><span class="cx">     if (!frame)
</span><span class="lines">@@ -136,9 +147,10 @@
</span><span class="cx">         delegate = d-&gt;m_proxy.get();
</span><span class="cx">     } else 
</span><span class="cx">         delegate = ResourceHandle::delegate();
</span><del>-    
-    associateStreamWithResourceHandle([d-&gt;m_request.nsURLRequest() HTTPBodyStream], this);
</del><span class="cx"> 
</span><ins>+    if (!ResourceHandle::didSendBodyDataDelegateExists())
+        associateStreamWithResourceHandle([d-&gt;m_request.nsURLRequest() HTTPBodyStream], this);
+
</ins><span class="cx">     NSURLConnection *connection;
</span><span class="cx">     
</span><span class="cx">     if (d-&gt;m_shouldContentSniff) 
</span><span class="lines">@@ -196,7 +208,8 @@
</span><span class="cx"> 
</span><span class="cx"> void ResourceHandle::cancel()
</span><span class="cx"> {
</span><del>-    disassociateStreamWithResourceHandle([d-&gt;m_request.nsURLRequest() HTTPBodyStream]);
</del><ins>+    if (!ResourceHandle::didSendBodyDataDelegateExists())
+        disassociateStreamWithResourceHandle([d-&gt;m_request.nsURLRequest() HTTPBodyStream]);
</ins><span class="cx">     [d-&gt;m_connection.get() cancel];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -447,13 +460,15 @@
</span><span class="cx">     m_url = copy;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    // The client may change the request's body stream, in which case we have to re-associate
-    // the handle with the new stream so upload progress callbacks continue to work correctly.
-    NSInputStream* oldBodyStream = [newRequest HTTPBodyStream];
-    NSInputStream* newBodyStream = [request.nsURLRequest() HTTPBodyStream];
-    if (oldBodyStream != newBodyStream) {
-        disassociateStreamWithResourceHandle(oldBodyStream);
-        associateStreamWithResourceHandle(newBodyStream, m_handle);
</del><ins>+    if (!ResourceHandle::didSendBodyDataDelegateExists()) {
+        // The client may change the request's body stream, in which case we have to re-associate
+        // the handle with the new stream so upload progress callbacks continue to work correctly.
+        NSInputStream* oldBodyStream = [newRequest HTTPBodyStream];
+        NSInputStream* newBodyStream = [request.nsURLRequest() HTTPBodyStream];
+        if (oldBodyStream != newBodyStream) {
+            disassociateStreamWithResourceHandle(oldBodyStream);
+            associateStreamWithResourceHandle(newBodyStream, m_handle);
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return request.nsURLRequest();
</span><span class="lines">@@ -521,12 +536,23 @@
</span><span class="cx">     m_handle-&gt;client()-&gt;willStopBufferingData(m_handle, (const char*)[data bytes], static_cast&lt;int&gt;([data length]));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite
+{
+    if (!m_handle || !m_handle-&gt;client())
+        return;
+    CallbackGuard guard;
+    m_handle-&gt;client()-&gt;didSendData(m_handle, totalBytesWritten, totalBytesExpectedToWrite);
+}
+
</ins><span class="cx"> - (void)connectionDidFinishLoading:(NSURLConnection *)con
</span><span class="cx"> {
</span><span class="cx">     if (!m_handle || !m_handle-&gt;client())
</span><span class="cx">         return;
</span><span class="cx">     CallbackGuard guard;
</span><del>-    disassociateStreamWithResourceHandle([m_handle-&gt;request().nsURLRequest() HTTPBodyStream]);
</del><ins>+
+    if (!ResourceHandle::didSendBodyDataDelegateExists())
+        disassociateStreamWithResourceHandle([m_handle-&gt;request().nsURLRequest() HTTPBodyStream]);
+
</ins><span class="cx">     m_handle-&gt;client()-&gt;didFinishLoading(m_handle);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -535,7 +561,10 @@
</span><span class="cx">     if (!m_handle || !m_handle-&gt;client())
</span><span class="cx">         return;
</span><span class="cx">     CallbackGuard guard;
</span><del>-    disassociateStreamWithResourceHandle([m_handle-&gt;request().nsURLRequest() HTTPBodyStream]);
</del><ins>+
+    if (!ResourceHandle::didSendBodyDataDelegateExists())
+        disassociateStreamWithResourceHandle([m_handle-&gt;request().nsURLRequest() HTTPBodyStream]);
+
</ins><span class="cx">     m_handle-&gt;client()-&gt;didFail(m_handle, error);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>