<!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>[285313] branches/safari-612-branch/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/285313">285313</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-11-04 14:39:52 -0700 (Thu, 04 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Apply patch. rdar://problem/80991209</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchSourceWebCoreChangeLog">branches/safari-612-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCoreloaderPrivateClickMeasurementcpp">branches/safari-612-branch/Source/WebCore/loader/PrivateClickMeasurement.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCoreloaderPrivateClickMeasurementh">branches/safari-612-branch/Source/WebCore/loader/PrivateClickMeasurement.h</a></li>
<li><a href="#branchessafari612branchSourceWebKitChangeLog">branches/safari-612-branch/Source/WebKit/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (285312 => 285313)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/ChangeLog      2021-11-04 21:37:26 UTC (rev 285312)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-11-04 21:39:52 UTC (rev 285313)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2021-11-04  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Apply patch. rdar://problem/80991209
+
+    2021-11-04  Kate Cheney  <katherine_cheney@apple.com>
+
+            PCM: Safari on iOS and macOS are not sending ad click attribution reports for Private Click Measurement
+            https://bugs.webkit.org/show_bug.cgi?id=228104
+            <rdar://problem/80991209>
+
+            Reviewed by John Wilander.
+
+            No new tests. Several existing tests would timeout with the removal of
+            m_firePendingAttributionRequestsTimer.startOneShot(m_isRunningTest ? 0_s : seconds)
+            if the fix wasn't in place.
+
+            * loader/PrivateClickMeasurement.cpp:
+            (WebCore::randomlyBetweenTwentyFourAndFortyEightHours):
+            (WebCore::PrivateClickMeasurement::attributeAndGetEarliestTimeToSend):
+            * loader/PrivateClickMeasurement.h:
+
+2021-11-04  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r285089. rdar://problem/84522357
</span><span class="cx"> 
</span><span class="cx">     Layer tree should not be stuck in frozen state after explicitly stopping a page load
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreloaderPrivateClickMeasurementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/loader/PrivateClickMeasurement.cpp (285312 => 285313)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/loader/PrivateClickMeasurement.cpp     2021-11-04 21:37:26 UTC (rev 285312)
+++ branches/safari-612-branch/Source/WebCore/loader/PrivateClickMeasurement.cpp        2021-11-04 21:39:52 UTC (rev 285313)
</span><span class="lines">@@ -148,12 +148,12 @@
</span><span class="cx">     m_sourceApplicationBundleID = appBundleIDForTesting;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static Seconds randomlyBetweenTwentyFourAndFortyEightHours()
</del><ins>+static Seconds randomlyBetweenTwentyFourAndFortyEightHours(PrivateClickMeasurement::IsRunningLayoutTest isRunningTest)
</ins><span class="cx"> {
</span><del>-    return 24_h + Seconds(randomNumber() * (24_h).value());
</del><ins>+    return isRunningTest == PrivateClickMeasurement::IsRunningLayoutTest::Yes ? 1_s : 24_h + Seconds(randomNumber() * (24_h).value());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-PrivateClickMeasurement::AttributionSecondsUntilSendData PrivateClickMeasurement::attributeAndGetEarliestTimeToSend(AttributionTriggerData&& attributionTriggerData)
</del><ins>+PrivateClickMeasurement::AttributionSecondsUntilSendData PrivateClickMeasurement::attributeAndGetEarliestTimeToSend(AttributionTriggerData&& attributionTriggerData, IsRunningLayoutTest isRunningTest)
</ins><span class="cx"> {
</span><span class="cx">     if (!attributionTriggerData.isValid() || (m_attributionTriggerData && m_attributionTriggerData->priority >= attributionTriggerData.priority))
</span><span class="cx">         return { };
</span><span class="lines">@@ -161,8 +161,8 @@
</span><span class="cx">     m_attributionTriggerData = WTFMove(attributionTriggerData);
</span><span class="cx">     // 24-48 hour delay before sending. This helps privacy since the conversion and the attribution
</span><span class="cx">     // requests are detached and the time of the attribution does not reveal the time of the conversion.
</span><del>-    auto sourceSecondsUntilSend = randomlyBetweenTwentyFourAndFortyEightHours();
-    auto destinationSecondsUntilSend = randomlyBetweenTwentyFourAndFortyEightHours();
</del><ins>+    auto sourceSecondsUntilSend = randomlyBetweenTwentyFourAndFortyEightHours(isRunningTest);
+    auto destinationSecondsUntilSend = randomlyBetweenTwentyFourAndFortyEightHours(isRunningTest);
</ins><span class="cx">     m_timesToSend = { WallTime::now() + sourceSecondsUntilSend, WallTime::now() + destinationSecondsUntilSend };
</span><span class="cx"> 
</span><span class="cx">     return AttributionSecondsUntilSendData { sourceSecondsUntilSend, destinationSecondsUntilSend };
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreloaderPrivateClickMeasurementh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/loader/PrivateClickMeasurement.h (285312 => 285313)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/loader/PrivateClickMeasurement.h       2021-11-04 21:37:26 UTC (rev 285312)
+++ branches/safari-612-branch/Source/WebCore/loader/PrivateClickMeasurement.h  2021-11-04 21:39:52 UTC (rev 285313)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> 
</span><span class="cx">     enum class PcmDataCarried : bool { NonPersonallyIdentifiable, PersonallyIdentifiable };
</span><span class="cx">     enum class AttributionReportEndpoint : bool { Source, Destination };
</span><ins>+    enum class IsRunningLayoutTest : bool { No, Yes };
</ins><span class="cx"> 
</span><span class="cx">     struct SourceID {
</span><span class="cx">         static constexpr uint32_t MaxEntropy = 255;
</span><span class="lines">@@ -326,7 +327,7 @@
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT static const Seconds maxAge();
</span><span class="cx">     WEBCORE_EXPORT static Expected<AttributionTriggerData, String> parseAttributionRequest(const URL& redirectURL);
</span><del>-    WEBCORE_EXPORT AttributionSecondsUntilSendData attributeAndGetEarliestTimeToSend(AttributionTriggerData&&);
</del><ins>+    WEBCORE_EXPORT AttributionSecondsUntilSendData attributeAndGetEarliestTimeToSend(AttributionTriggerData&&, IsRunningLayoutTest);
</ins><span class="cx">     WEBCORE_EXPORT bool hasHigherPriorityThan(const PrivateClickMeasurement&) const;
</span><span class="cx">     WEBCORE_EXPORT URL attributionReportSourceURL() const;
</span><span class="cx">     WEBCORE_EXPORT URL attributionReportAttributeOnURL() const;
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (285312 => 285313)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/ChangeLog       2021-11-04 21:37:26 UTC (rev 285312)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog  2021-11-04 21:39:52 UTC (rev 285313)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2021-11-04  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Apply patch. rdar://problem/80991209
+
+    2021-11-04  Kate Cheney  <katherine_cheney@apple.com>
+
+            PCM: Safari on iOS and macOS are not sending ad click attribution reports for Private Click Measurement
+            https://bugs.webkit.org/show_bug.cgi?id=228104
+            <rdar://problem/80991209>
+
+            Reviewed by John Wilander.
+
+            firePendingAttributionRequests() was sometimes scheduling the next timer
+            fire to be the raw time value instead of the difference between now
+            and the scheduled send time. This was resulting in some reports not being
+            sent within the 24-48 hour range.
+
+            To test this, this patch removes the immediate timer fire for testing
+            and instead sets the earliest time to send values to both be 1 second.
+            This will test that the proper timer gets set to send both reports.
+
+            * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp:
+            (WebKit::PCM::Database::attributePrivateClickMeasurement):
+            * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.h:
+            * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp:
+            (WebKit::PrivateClickMeasurementManager::startTimer):
+            (WebKit::PrivateClickMeasurementManager::attribute):
+            (WebKit::PrivateClickMeasurementManager::randomlyBetweenFifteenAndThirtyMinutes const):
+            (WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests):
+            In the case of both times being past due to report, schedule one for
+            15 - 30 minutes later.
+
+            * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.h:
+            * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp:
+            (WebKit::PCM::Store::attributePrivateClickMeasurement):
+            * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.h:
+
+2021-11-04  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r285177. rdar://problem/85033636
</span><span class="cx"> 
</span><span class="cx">     Terminate unresponsive network process by crashing it
</span></span></pre>
</div>
</div>

</body>
</html>