<!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>[168849] 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/168849">168849</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-05-14 11:28:58 -0700 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor duplicate code in web timing.
https://bugs.webkit.org/show_bug.cgi?id=132917
Reviewed by Alexey Proskuryakov.
* platform/network/ResourceHandle.h:
Added getTimingData declaration.
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::getTimingData):
* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
(-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveResponse:]):
Moved duplicate code to ResourceHandle.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168848 => 168849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-14 18:02:58 UTC (rev 168848)
+++ trunk/Source/WebCore/ChangeLog 2014-05-14 18:28:58 UTC (rev 168849)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-05-14 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Refactor duplicate code in web timing.
+ https://bugs.webkit.org/show_bug.cgi?id=132917
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/network/ResourceHandle.h:
+ Added getTimingData declaration.
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::getTimingData):
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+ (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+ (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveResponse:]):
+ Moved duplicate code to ResourceHandle.
+
+2014-05-14 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Use references instead of pointers with ResourceLoadTiming.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132846
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (168848 => 168849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-05-14 18:02:58 UTC (rev 168848)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-05-14 18:28:58 UTC (rev 168849)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceHandleClient;
</span><span class="cx"> class ResourceHandleInternal;
</span><ins>+class ResourceLoadTiming;
</ins><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><span class="cx"> class SharedBuffer;
</span><span class="lines">@@ -130,6 +131,7 @@
</span><span class="cx"> #if PLATFORM(COCOA) && !USE(CFNETWORK)
</span><span class="cx"> void didCancelAuthenticationChallenge(const AuthenticationChallenge&);
</span><span class="cx"> NSURLConnection *connection() const;
</span><ins>+ static void getTimingData(NSURLConnection*, ResourceLoadTiming&);
</ins><span class="cx"> id makeDelegate(bool);
</span><span class="cx"> id delegate();
</span><span class="cx"> void releaseDelegate();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (168848 => 168849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-05-14 18:02:58 UTC (rev 168848)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-05-14 18:28:58 UTC (rev 168849)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #else
</span><span class="cx"> @interface NSURLConnection (TimingData)
</span><span class="cx"> + (void)_setCollectsTimingData:(BOOL)collect;
</span><ins>+- (NSDictionary *)_timingData;
</ins><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -368,7 +369,32 @@
</span><span class="cx"> {
</span><span class="cx"> return d->m_connection.get();
</span><span class="cx"> }
</span><del>-
</del><ins>+
+void ResourceHandle::getTimingData(NSURLConnection *connection, ResourceLoadTiming& timing)
+{
+ if (NSDictionary *timingData = [connection _timingData]) {
+ // This is not the navigationStart time in monotonic time, but the other times are relative to this time
+ // and only the differences between times are stored.
+ double referenceStart = [[timingData valueForKey:@"_kCFNTimingDataTimingDataInit"] doubleValue];
+
+ double domainLookupStart = [[timingData valueForKey:@"_kCFNTimingDataDomainLookupStart"] doubleValue];
+ double domainLookupEnd = [[timingData valueForKey:@"_kCFNTimingDataDomainLookupEnd"] doubleValue];
+ double connectStart = [[timingData valueForKey:@"_kCFNTimingDataConnectStart"] doubleValue];
+ double secureConnectionStart = [[timingData valueForKey:@"_kCFNTimingDataSecureConnectionStart"] doubleValue];
+ double connectEnd = [[timingData valueForKey:@"_kCFNTimingDataConnectEnd"] doubleValue];
+ double requestStart = [[timingData valueForKey:@"_kCFNTimingDataRequestStart"] doubleValue];
+ double responseStart = [[timingData valueForKey:@"_kCFNTimingDataResponseStart"] doubleValue];
+
+ timing.domainLookupStart = domainLookupStart <= 0 ? -1 : (domainLookupStart - referenceStart) * 1000;
+ timing.domainLookupEnd = domainLookupEnd <= 0 ? -1 : (domainLookupEnd - referenceStart) * 1000;
+ timing.connectStart = connectStart <= 0 ? -1 : (connectStart - referenceStart) * 1000;
+ timing.secureConnectionStart = secureConnectionStart <= 0 ? -1 : (secureConnectionStart - referenceStart) * 1000;
+ timing.connectEnd = connectEnd <= 0 ? -1 : (connectEnd - referenceStart) * 1000;
+ timing.requestStart = requestStart <= 0 ? -1 : (requestStart - referenceStart) * 1000;
+ timing.responseStart = responseStart <= 0 ? -1 : (responseStart - referenceStart) * 1000;
+ }
+}
+
</ins><span class="cx"> bool ResourceHandle::loadsBlocked()
</span><span class="cx"> {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (168848 => 168849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-05-14 18:02:58 UTC (rev 168848)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-05-14 18:28:58 UTC (rev 168849)
</span><span class="lines">@@ -38,14 +38,6 @@
</span><span class="cx"> #import "SharedBuffer.h"
</span><span class="cx"> #import "WebCoreURLResponse.h"
</span><span class="cx">
</span><del>-#if __has_include(<CFNetwork/CFNSURLConnection.h>)
-#import <CFNetwork/CFNSURLConnection.h>
-#else
-@interface NSURLConnection (TimingData)
-- (NSDictionary *)_timingData;
-@end
-#endif
-
</del><span class="cx"> @interface NSURLRequest (Details)
</span><span class="cx"> - (id)_propertyForKey:(NSString *)key;
</span><span class="cx"> @end
</span><span class="lines">@@ -180,28 +172,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceResponse resourceResponse(r);
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- if (NSDictionary *timingData = [connection _timingData]) {
- // This is not the navigationStart time in monotonic time, but the other times are relative to this time
- // and only the differences between times are stored.
- double referenceStart = [[timingData valueForKey:@"_kCFNTimingDataTimingDataInit"] doubleValue];
-
- double domainLookupStart = [[timingData valueForKey:@"_kCFNTimingDataDomainLookupStart"] doubleValue];
- double domainLookupEnd = [[timingData valueForKey:@"_kCFNTimingDataDomainLookupEnd"] doubleValue];
- double connectStart = [[timingData valueForKey:@"_kCFNTimingDataConnectStart"] doubleValue];
- double secureConnectionStart = [[timingData valueForKey:@"_kCFNTimingDataSecureConnectionStart"] doubleValue];
- double connectEnd = [[timingData valueForKey:@"_kCFNTimingDataConnectEnd"] doubleValue];
- double requestStart = [[timingData valueForKey:@"_kCFNTimingDataRequestStart"] doubleValue];
- double responseStart = [[timingData valueForKey:@"_kCFNTimingDataResponseStart"] doubleValue];
-
- ResourceLoadTiming& timing = resourceResponse.resourceLoadTiming();
- timing.domainLookupStart = domainLookupStart <= 0.0 ? -1 : (domainLookupStart - referenceStart) * 1000;
- timing.domainLookupEnd = domainLookupEnd <= 0.0 ? -1 : (domainLookupEnd - referenceStart) * 1000;
- timing.connectStart = connectStart <= 0.0 ? -1 : (connectStart - referenceStart) * 1000;
- timing.secureConnectionStart = secureConnectionStart <= 0.0 ? -1 : (secureConnectionStart - referenceStart) * 1000;
- timing.connectEnd = connectEnd <= 0.0 ? -1 : (connectEnd - referenceStart) * 1000;
- timing.requestStart = requestStart <= 0.0 ? -1 : (requestStart - referenceStart) * 1000;
- timing.responseStart = responseStart <= 0.0 ? -1 : (responseStart - referenceStart) * 1000;
- }
</del><ins>+ ResourceHandle::getTimingData(connection, resourceResponse.resourceLoadTiming());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(connection);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (168848 => 168849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-05-14 18:02:58 UTC (rev 168848)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-05-14 18:28:58 UTC (rev 168849)
</span><span class="lines">@@ -39,14 +39,6 @@
</span><span class="cx"> #import "WebCoreURLResponse.h"
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx">
</span><del>-#if __has_include(<CFNetwork/CFNSURLConnection.h>)
-#import <CFNetwork/CFNSURLConnection.h>
-#else
-@interface NSURLConnection (TimingData)
-- (NSDictionary *)_timingData;
-@end
-#endif
-
</del><span class="cx"> @interface NSURLRequest (Details)
</span><span class="cx"> - (id)_propertyForKey:(NSString *)key;
</span><span class="cx"> @end
</span><span class="lines">@@ -222,28 +214,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceResponse resourceResponse(r);
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- if (NSDictionary *timingData = [connection _timingData]) {
- // This is not the navigationStart time in monotonic time, but the other times are relative to this time
- // and only the differences between times are stored.
- double referenceStart = [[timingData valueForKey:@"_kCFNTimingDataTimingDataInit"] doubleValue];
-
- double domainLookupStart = [[timingData valueForKey:@"_kCFNTimingDataDomainLookupStart"] doubleValue];
- double domainLookupEnd = [[timingData valueForKey:@"_kCFNTimingDataDomainLookupEnd"] doubleValue];
- double connectStart = [[timingData valueForKey:@"_kCFNTimingDataConnectStart"] doubleValue];
- double secureConnectionStart = [[timingData valueForKey:@"_kCFNTimingDataSecureConnectionStart"] doubleValue];
- double connectEnd = [[timingData valueForKey:@"_kCFNTimingDataConnectEnd"] doubleValue];
- double requestStart = [[timingData valueForKey:@"_kCFNTimingDataRequestStart"] doubleValue];
- double responseStart = [[timingData valueForKey:@"_kCFNTimingDataResponseStart"] doubleValue];
-
- ResourceLoadTiming& timing = resourceResponse.resourceLoadTiming();
- timing.domainLookupStart = domainLookupStart <= 0.0 ? -1 : (domainLookupStart - referenceStart) * 1000;
- timing.domainLookupEnd = domainLookupEnd <= 0.0 ? -1 : (domainLookupEnd - referenceStart) * 1000;
- timing.connectStart = connectStart <= 0.0 ? -1 : (connectStart - referenceStart) * 1000;
- timing.secureConnectionStart = secureConnectionStart <= 0.0 ? -1 : (secureConnectionStart - referenceStart) * 1000;
- timing.connectEnd = connectEnd <= 0.0 ? -1 : (connectEnd - referenceStart) * 1000;
- timing.requestStart = requestStart <= 0.0 ? -1 : (requestStart - referenceStart) * 1000;
- timing.responseStart = responseStart <= 0.0 ? -1 : (responseStart - referenceStart) * 1000;
- }
</del><ins>+ ResourceHandle::getTimingData(connection, resourceResponse.resourceLoadTiming());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(connection);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>