<!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>[185264] trunk/Source</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/185264">185264</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 14:37:44 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Web Timing] Use new SPI to enable data collection.
https://bugs.webkit.org/show_bug.cgi?id=145650
rdar://problem/21203358
Reviewed by Chris Dumez.
Source/WebCore:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::createCFURLConnection):
Gather web timing data on iOS.
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::createNSURLConnection):
(WebCore::ResourceHandle::setCollectsTimingData):
Gather web timing data on Mac.
Source/WTF:
* wtf/Platform.h:
Added HAVE_TIMINGDATAOPTIONS for platform and version dependent feature.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (185263 => 185264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-06-05 21:36:16 UTC (rev 185263)
+++ trunk/Source/WTF/ChangeLog 2015-06-05 21:37:44 UTC (rev 185264)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-05 Alex Christensen <achristensen@webkit.org>
+
+ [Web Timing] Use new SPI to enable data collection.
+ https://bugs.webkit.org/show_bug.cgi?id=145650
+ rdar://problem/21203358
+
+ Reviewed by Chris Dumez.
+
+ * wtf/Platform.h:
+ Added HAVE_TIMINGDATAOPTIONS for platform and version dependent feature.
+
</ins><span class="cx"> 2015-06-05 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] ReadableStream should store callbacks as a Deque
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (185263 => 185264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-06-05 21:36:16 UTC (rev 185263)
+++ trunk/Source/WTF/wtf/Platform.h 2015-06-05 21:37:44 UTC (rev 185264)
</span><span class="lines">@@ -1077,6 +1077,10 @@
</span><span class="cx"> #define USE_INSERTION_UNDO_GROUPING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
+#define HAVE_TIMINGDATAOPTIONS 1
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #define USE_PLATFORM_TEXT_TRACK_MENU 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185263 => 185264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-05 21:36:16 UTC (rev 185263)
+++ trunk/Source/WebCore/ChangeLog 2015-06-05 21:37:44 UTC (rev 185264)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-05 Alex Christensen <achristensen@webkit.org>
+
+ [Web Timing] Use new SPI to enable data collection.
+ https://bugs.webkit.org/show_bug.cgi?id=145650
+ rdar://problem/21203358
+
+ Reviewed by Chris Dumez.
+
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::createCFURLConnection):
+ Gather web timing data on iOS.
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::createNSURLConnection):
+ (WebCore::ResourceHandle::setCollectsTimingData):
+ Gather web timing data on Mac.
+
</ins><span class="cx"> 2015-06-05 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] ReadableStream should store callbacks as a Deque
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (185263 => 185264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-06-05 21:36:16 UTC (rev 185263)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-06-05 21:37:44 UTC (rev 185264)
</span><span class="lines">@@ -206,6 +206,13 @@
</span><span class="cx"> propertiesDictionary = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, clientProperties));
</span><span class="cx"> else
</span><span class="cx"> propertiesDictionary = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><ins>+#if HAVE(TIMINGDATAOPTIONS)
+ const int64_t TimingDataOptionsEnableW3CNavigationTiming = (1 << 0);
+ auto enableW3CNavigationTiming = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt64Type, &TimingDataOptionsEnableW3CNavigationTiming));
+ auto timingDataOptionsDictionary = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+ CFDictionaryAddValue(timingDataOptionsDictionary.get(), CFSTR("_kCFURLConnectionPropertyTimingDataOptions"), enableW3CNavigationTiming.get());
+ CFDictionaryAddValue(propertiesDictionary.get(), CFSTR("kCFURLConnectionURLConnectionProperties"), timingDataOptionsDictionary.get());
+#endif
</ins><span class="cx">
</span><span class="cx"> // FIXME: This code is different from iOS code in ResourceHandleMac.mm in that here we ignore stream properties that were present in client properties.
</span><span class="cx"> CFDictionaryAddValue(propertiesDictionary.get(), kCFURLConnectionSocketStreamProperties, streamProperties);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (185263 => 185264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-06-05 21:36:16 UTC (rev 185263)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-06-05 21:37:44 UTC (rev 185264)
</span><span class="lines">@@ -69,7 +69,9 @@
</span><span class="cx"> #import <Foundation/NSURLConnectionPrivate.h>
</span><span class="cx"> #else
</span><span class="cx"> @interface NSURLConnection (TimingData)
</span><ins>+#if !HAVE(TIMINGDATAOPTIONS)
</ins><span class="cx"> + (void)_setCollectsTimingData:(BOOL)collect;
</span><ins>+#endif
</ins><span class="cx"> - (NSDictionary *)_timingData;
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="lines">@@ -217,9 +219,13 @@
</span><span class="cx"> if (synchronousWillSendRequestEnabled())
</span><span class="cx"> CFURLRequestSetShouldStartSynchronously([nsRequest _CFURLRequest], 1);
</span><span class="cx"> #else
</span><del>- NSDictionary *propertyDictionary = [NSDictionary dictionaryWithObject:streamProperties forKey:@"kCFURLConnectionSocketStreamProperties"];
</del><ins>+ NSMutableDictionary *propertyDictionary = [NSMutableDictionary dictionaryWithObject:streamProperties forKey:@"kCFURLConnectionSocketStreamProperties"];
</ins><span class="cx"> const bool usesCache = true;
</span><span class="cx"> #endif
</span><ins>+#if HAVE(TIMINGDATAOPTIONS)
+ const int64_t TimingDataOptionsEnableW3CNavigationTiming = (1 << 0);
+ [propertyDictionary setObject:@{@"_kCFURLConnectionPropertyTimingDataOptions": @(TimingDataOptionsEnableW3CNavigationTiming)} forKey:@"kCFURLConnectionURLConnectionProperties"];
+#endif
</ins><span class="cx"> d->m_connection = adoptNS([[NSURLConnection alloc] _initWithRequest:nsRequest delegate:delegate usesCache:usesCache maxContentLength:0 startImmediately:NO connectionProperties:propertyDictionary]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -746,10 +752,12 @@
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::setCollectsTimingData()
</span><span class="cx"> {
</span><ins>+#if !HAVE(TIMINGDATAOPTIONS)
</ins><span class="cx"> static dispatch_once_t onceToken;
</span><span class="cx"> dispatch_once(&onceToken, ^{
</span><span class="cx"> [NSURLConnection _setCollectsTimingData:YES];
</span><span class="cx"> });
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span></span></pre>
</div>
</div>
</body>
</html>