Changeset 173501 in webkit

Timestamp:

Sep 10, 2014, 5:47:26 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

Call setCollectsTimingData only once, and before making any {CF,NS}URLConnections
​https://bugs.webkit.org/show_bug.cgi?id=136731
<rdar://problem/18252844>

Reviewed by Simon Fraser.

• platform/network/cf/ResourceHandleCFNet.cpp:

(WebCore::ResourceHandle::start):
Move setCollectsTimingData to before createCFURLConnection, so the first connection
has timing data associated with it.

• platform/network/mac/ResourceHandleMac.mm:

(WebCore::ResourceHandle::createNSURLConnection):
Move setCollectsTimingData to before we create our NSURLConnection, so the first connection
has timing data associated with it.
Use setCollectsTimingData instead of the NSURLConnection SPI directly.

(WebCore::ResourceHandle::setCollectsTimingData):
Only call _setCollectsTimingData once.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (2 diffs)
• platform/network/mac/ResourceHandleMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-10  Tim Horton  <timothy_horton@apple.com>
+
+        Call setCollectsTimingData only once, and before making any {CF,NS}URLConnections
+        https://bugs.webkit.org/show_bug.cgi?id=136731
+        <rdar://problem/18252844>
+
+        Reviewed by Simon Fraser.
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::ResourceHandle::start):
+        Move setCollectsTimingData to before createCFURLConnection, so the first connection
+        has timing data associated with it.
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::createNSURLConnection):
+        Move setCollectsTimingData to before we create our NSURLConnection, so the first connection
+        has timing data associated with it.
+        Use setCollectsTimingData instead of the NSURLConnection SPI directly.
+
+        (WebCore::ResourceHandle::setCollectsTimingData):
+        Only call _setCollectsTimingData once.
+
 2014-09-10  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -250 +250 @@
     bool shouldUseCredentialStorage = !client() || client()->shouldUseCredentialStorage(this);
 
+#if ENABLE(WEB_TIMING)
+    setCollectsTimingData();
+#endif
+
     createCFURLConnection(shouldUseCredentialStorage, d->m_shouldContentSniff, SchedulingBehavior::Asynchronous, client()->connectionProperties(this).get());
 
@@ -256 +260 @@
 
     LOG(Network, "CFNet - Starting URL %s (handle=%p, conn=%p)", firstRequest().url().string().utf8().data(), this, d->m_connection.get());
-    
-#if ENABLE(WEB_TIMING)
-    setCollectsTimingData();
-#endif
     
     return true;

trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -145 +145 @@
 #endif
 {
+#if ENABLE(WEB_TIMING)
+    setCollectsTimingData();
+#endif
+
     // Credentials for ftp can only be passed in URL, the connection:didReceiveAuthenticationChallenge: delegate call won't be made.
     if ((!d->m_user.isEmpty() || !d->m_pass.isEmpty()) && !firstRequest().url().protocolIsInHTTPFamily()) {
@@ -222 +226 @@
 #endif
     d->m_connection = adoptNS([[NSURLConnection alloc] _initWithRequest:nsRequest delegate:delegate usesCache:usesCache maxContentLength:0 startImmediately:NO connectionProperties:propertyDictionary]);
-#if ENABLE(WEB_TIMING)
-    [NSURLConnection _setCollectsTimingData:YES];
-#endif
 }
 
@@ -759 +760 @@
 void ResourceHandle::setCollectsTimingData()
 {
-    [NSURLConnection _setCollectsTimingData:YES];
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        [NSURLConnection _setCollectsTimingData:YES];
+    });
 }