Attachment 371875 Details for Bug 198762 – Patch

[patch] Patch

bug-198762-20190611135800.patch (text/plain), 7.38 KB, created by Devin Rousso on 2019-06-11 13:58:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-11 13:58:01 PDT

Size: 7.38 KB

patch

obsolete

>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 24c80213c63d467eb1f3dae2c68b3df53decb771..461f7a3204ce5c00afc36b38dd9245de0a33175e 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-06-11  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Network: replace CFNetwork SPI with new API where able
>+        https://bugs.webkit.org/show_bug.cgi?id=198762
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Platform.h:
>+
> 2019-06-10  Andy Estes  <aestes@apple.com>
> 
>         [iOS] Use PDFKit SPI for taking snapshots when the hosting app is not entitled for global capture
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 43960fa637ed47c4c700540545e213bf5b95b468..9786b92a7ad3b62e3013320ef50070a0606255b1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-06-11  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Network: replace CFNetwork SPI with new API where able
>+        https://bugs.webkit.org/show_bug.cgi?id=198762
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/network/NetworkLoadMetrics.h:
>+
> 2019-06-11  Devin Rousso  <drousso@apple.com>
> 
>         Include `touch-action` in the computed styles list
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 96691b28fca4c228d042055b67f94a51148bfa24..ce476d0392b86251ff1ed20d4d4a98c82a016b49 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-06-11  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Network: replace CFNetwork SPI with new API where able
>+        https://bugs.webkit.org/show_bug.cgi?id=198762
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/spi/cf/CFNetworkSPI.h:
>+
> 2019-06-10  Sam Weinig  <weinig@apple.com>
> 
>         Remove Dashboard support
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 132a1e670f07e43122fd47b6c8f5feda406be8c2..1e5d7499fb974f5ffe6a3b99f5fb0917511e0f80 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-11  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Network: replace CFNetwork SPI with new API where able
>+        https://bugs.webkit.org/show_bug.cgi?id=198762
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
>+        (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
>+
> 2019-06-11  Antti Koivisto  <antti@apple.com>
> 
>         REGRESSION (iOS): Can't scroll litter-robot.com checkout form's dropdown menus
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 83d36730df89392ed47bbee1ed2f4ef675f67091..709f6bd1ed5d021f33316d836cc364dd28156670 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1499,8 +1499,13 @@
> #define HAVE_CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE 1
> #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
> 
> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
>diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>index 897af04f685c58ea3f64fb8631f770eb7b6b074f..af00981b3db5284ca87f40fc2fda7fe943ac418f 100644
>--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>@@ -214,7 +214,7 @@ typedef NS_ENUM(NSInteger, NSURLSessionCompanionProxyPreference) {
> #endif
> @end
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
>+#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
> @interface NSURLSessionTaskTransactionMetrics ()
> @property (copy, readonly) NSString* _remoteAddressAndPort;
> @property (copy, readonly) NSUUID* _connectionIdentifier;
>diff --git a/Source/WebCore/platform/network/NetworkLoadMetrics.h b/Source/WebCore/platform/network/NetworkLoadMetrics.h
>index 156f2234cc2c874381fff8460ec37023be970fbc..03c18b6927a2d4060e98f4d23f1db52841d275ae 100644
>--- a/Source/WebCore/platform/network/NetworkLoadMetrics.h
>+++ b/Source/WebCore/platform/network/NetworkLoadMetrics.h
>@@ -176,8 +176,8 @@ public:
> 
>     HTTPHeaderMap requestHeaders;
> 
>-    uint32_t requestHeaderBytesSent;
>-    uint32_t responseHeaderBytesReceived;
>+    uint64_t requestHeaderBytesSent;
>+    uint64_t responseHeaderBytesReceived;
>     uint64_t requestBodyBytesSent;
>     uint64_t responseBodyBytesReceived;
>     uint64_t responseBodyDecodedSize;
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>index 2aec543de3e81e19ef2b960aafccee3d1f9a508b..fa14eeba66b2da7aa1a4ed7aa167bf1d6b7685f6 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>@@ -677,7 +677,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didFini
>         if (networkDataTask->shouldCaptureExtraNetworkLoadMetrics()) {
>             networkLoadMetrics.priority = toNetworkLoadPriority(task.priority);
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
>+#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
>             networkLoadMetrics.remoteAddress = String(m._remoteAddressAndPort);
>             networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
> #endif
>@@ -693,7 +693,21 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didFini
>             }];
>             networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
>+#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)
>             uint64_t requestHeaderBytesSent = 0;
>             uint64_t responseHeaderBytesReceived = 0;
>             uint64_t responseBodyBytesReceived = 0;

Actions: View | Formatted Diff | Diff

Attachments on bug 198762: 371875 | 371887