Title: [292066] branches/safari-613-branch/Source
- Revision
- 292066
- Author
- achristen...@apple.com
- Date
- 2022-03-29 13:53:29 -0700 (Tue, 29 Mar 2022)
Log Message
Revert r292055
https://bugs.webkit.org/show_bug.cgi?id=186919
Source/WebCore:
I accidentally put it on a branch.
* platform/network/cocoa/NetworkLoadMetrics.mm:
(WebCore::packageTimingData):
Source/WebKit:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (292065 => 292066)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-29 20:39:48 UTC (rev 292065)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-29 20:53:29 UTC (rev 292066)
@@ -1,5 +1,15 @@
2022-03-29 Alex Christensen <achristen...@webkit.org>
+ Revert r292055
+ https://bugs.webkit.org/show_bug.cgi?id=186919
+
+ I accidentally put it on a branch.
+
+ * platform/network/cocoa/NetworkLoadMetrics.mm:
+ (WebCore::packageTimingData):
+
+2022-03-29 Alex Christensen <achristen...@webkit.org>
+
Navigation Timing data is corrupt in WebView (UIWebView/WKWebView)
https://bugs.webkit.org/show_bug.cgi?id=186919
<rdar://41393423>
Modified: branches/safari-613-branch/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm (292065 => 292066)
--- branches/safari-613-branch/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm 2022-03-29 20:39:48 UTC (rev 292065)
+++ branches/safari-613-branch/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm 2022-03-29 20:53:29 UTC (rev 292066)
@@ -54,8 +54,7 @@
timing->secureConnectionStart = dateToMonotonicTime(secureConnectionStart);
timing->connectEnd = dateToMonotonicTime(connectEnd);
timing->requestStart = dateToMonotonicTime(requestStart);
- // Sometimes, likely because of <rdar://90997689>, responseStart is before requestStart. If this happens, use the later of the two.
- timing->responseStart = std::max(timing->requestStart, dateToMonotonicTime(responseStart));
+ timing->responseStart = dateToMonotonicTime(responseStart);
timing->redirectCount = redirectCount;
timing->failsTAOCheck = failsTAOCheck;
timing->hasCrossOriginRedirect = hasCrossOriginRedirect;
Modified: branches/safari-613-branch/Source/WebKit/ChangeLog (292065 => 292066)
--- branches/safari-613-branch/Source/WebKit/ChangeLog 2022-03-29 20:39:48 UTC (rev 292065)
+++ branches/safari-613-branch/Source/WebKit/ChangeLog 2022-03-29 20:53:29 UTC (rev 292066)
@@ -1,5 +1,13 @@
2022-03-29 Alex Christensen <achristen...@webkit.org>
+ Revert r292055
+ https://bugs.webkit.org/show_bug.cgi?id=186919
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
+
+2022-03-29 Alex Christensen <achristen...@webkit.org>
+
Navigation Timing data is corrupt in WebView (UIWebView/WKWebView)
https://bugs.webkit.org/show_bug.cgi?id=186919
<rdar://41393423>
Modified: branches/safari-613-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (292065 => 292066)
--- branches/safari-613-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-03-29 20:39:48 UTC (rev 292065)
+++ branches/safari-613-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-03-29 20:53:29 UTC (rev 292066)
@@ -835,8 +835,7 @@
networkLoadMetrics.secureConnectionStart = dateToMonotonicTime(m.secureConnectionStartDate);
networkLoadMetrics.connectEnd = dateToMonotonicTime(m.connectEndDate);
networkLoadMetrics.requestStart = dateToMonotonicTime(m.requestStartDate);
- // Sometimes, likely because of <rdar://90997689>, responseStart is before requestStart. If this happens, use the later of the two.
- networkLoadMetrics.responseStart = std::max(networkLoadMetrics.requestStart, dateToMonotonicTime(m.responseStartDate));
+ networkLoadMetrics.responseStart = dateToMonotonicTime(m.responseStartDate);
networkLoadMetrics.responseEnd = dateToMonotonicTime(m.responseEndDate);
networkLoadMetrics.markComplete();
networkLoadMetrics.redirectCount = metrics.redirectCount;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
