Changeset 247095 in webkit

Timestamp:

Jul 3, 2019 11:11:19 AM (5 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r246616.

Caused http/tests/inspector/network/har/har-page.html to fail
on Catalina.

Reverted changeset:

"Web Inspector: Network: replace CFNetwork SPI with new API
where able"
​https://bugs.webkit.org/show_bug.cgi?id=198762
​https://trac.webkit.org/changeset/246616

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (modified) (1 diff)
• WebCore/platform/network/NetworkLoadMetrics.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-07-03  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r246616.
+
+        Caused http/tests/inspector/network/har/har-page.html to fail
+        on Catalina.
+
+        Reverted changeset:
+
+        "Web Inspector: Network: replace CFNetwork SPI with new API
+        where able"
+        https://bugs.webkit.org/show_bug.cgi?id=198762
+        https://trac.webkit.org/changeset/246616
+
 2019-07-02  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1512 +1512 @@
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
-#define HAVE_CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI 1
-#endif
-
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
 #define HAVE_CFNETWORK_NEGOTIATED_SSL_PROTOCOL_CIPHER 1
-#define HAVE_CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_ADDITIONS 1
 #endif
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-03  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r246616.
+
+        Caused http/tests/inspector/network/har/har-page.html to fail
+        on Catalina.
+
+        Reverted changeset:
+
+        "Web Inspector: Network: replace CFNetwork SPI with new API
+        where able"
+        https://bugs.webkit.org/show_bug.cgi?id=198762
+        https://trac.webkit.org/changeset/246616
+
 2019-07-03  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2019-07-03  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r246616.
+
+        Caused http/tests/inspector/network/har/har-page.html to fail
+        on Catalina.
+
+        Reverted changeset:
+
+        "Web Inspector: Network: replace CFNetwork SPI with new API
+        where able"
+        https://bugs.webkit.org/show_bug.cgi?id=198762
+        https://trac.webkit.org/changeset/246616
+
 2019-06-28  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h

@@ -223 +223 @@
 @end
 
-#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
 @interface NSURLSessionTaskTransactionMetrics ()
 @property (copy, readonly) NSString* _remoteAddressAndPort;

trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h

@@ -177 +177 @@
     HTTPHeaderMap requestHeaders;
 
-    uint64_t requestHeaderBytesSent;
-    uint64_t responseHeaderBytesReceived;
+    uint32_t requestHeaderBytesSent;
+    uint32_t responseHeaderBytesReceived;
     uint64_t requestBodyBytesSent;
     uint64_t responseBodyBytesReceived;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-03  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r246616.
+
+        Caused http/tests/inspector/network/har/har-page.html to fail
+        on Catalina.
+
+        Reverted changeset:
+
+        "Web Inspector: Network: replace CFNetwork SPI with new API
+        where able"
+        https://bugs.webkit.org/show_bug.cgi?id=198762
+        https://trac.webkit.org/changeset/246616
+
 2019-07-03  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -683 +683 @@
             networkLoadMetrics.priority = toNetworkLoadPriority(task.priority);
 
-#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
             networkLoadMetrics.remoteAddress = String(m._remoteAddressAndPort);
             networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
@@ -699 +699 @@
             networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
 
-#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_ADDITIONS)
-            networkLoadMetrics.requestHeaderBytesSent = 0;
-            networkLoadMetrics.requestBodyBytesSent = 0;
-            networkLoadMetrics.responseHeaderBytesReceived = 0;
-            networkLoadMetrics.responseBodyBytesReceived = 0;
-            networkLoadMetrics.responseBodyDecodedSize = 0;
-
-            for (NSURLSessionTaskTransactionMetrics *transactionMetrics in metrics.transactionMetrics) {
-                networkLoadMetrics.requestHeaderBytesSent += transactionMetrics.countOfRequestHeaderBytesSent;
-                networkLoadMetrics.requestBodyBytesSent += transactionMetrics.countOfRequestBodyBytesSent;
-                networkLoadMetrics.responseHeaderBytesReceived += transactionMetrics.countOfResponseHeaderBytesReceived;
-                networkLoadMetrics.responseBodyBytesReceived += transactionMetrics.countOfResponseBodyBytesReceived;
-                networkLoadMetrics.responseBodyDecodedSize += transactionMetrics.countOfResponseBodyBytesAfterDecoding;
-            }
-#elif HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
             uint64_t requestHeaderBytesSent = 0;
             uint64_t responseHeaderBytesReceived = 0;