<!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>[281066] trunk/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/281066">281066</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2021-08-15 13:05:28 -0700 (Sun, 15 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Bug 229112: ThreadSanitizer: data races of WTF::String in WebResourceLoadStatisticsStore
<https://webkit.org/b/229112>
<rdar://problem/81940951>

Reviewed by Kate Cheney.

Source/WebCore:

Covered by running layout tests with TSan in:
    http/tests/privateClickMeasurement/

* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::parsePrivateClickMeasurement const):
- Add WTFMove() for updated SourceSite constructor.  Verified
  that this doesn't create a use-after-move issue.

* loader/PrivateClickMeasurement.h:
(WebCore::PrivateClickMeasurement::SourceSite::SourceSite):
- Change to take rvalue reference for efficiency and to match
  AttributionDestinationSite constructor.
(WebCore::PrivateClickMeasurement::SourceSite::isolatedCopy const): Add.
(WebCore::PrivateClickMeasurement::AttributionDestinationSite::isolatedCopy const): Add.
- Add isolatedCopy() methods to use in multi-threaded scenarios.

Source/WebKit:

* NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
(WebKit::WebResourceLoadStatisticsStore::attributePrivateClickMeasurement):
- Make isolated copies of sourceSite and destinationSite to fix
  data races.
(WebKit::WebResourceLoadStatisticsStore::privateClickMeasurementToString):
- Make isolated copy of WTF::String to fix data race.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPrivateClickMeasurementh">trunk/Source/WebCore/loader/PrivateClickMeasurement.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessClassifierWebResourceLoadStatisticsStorecpp">trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281065 => 281066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-15 19:02:34 UTC (rev 281065)
+++ trunk/Source/WebCore/ChangeLog      2021-08-15 20:05:28 UTC (rev 281066)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2021-08-15  David Kilzer  <ddkilzer@apple.com>
+
+        Bug 229112: ThreadSanitizer: data races of WTF::String in WebResourceLoadStatisticsStore
+        <https://webkit.org/b/229112>
+        <rdar://problem/81940951>
+
+        Reviewed by Kate Cheney.
+
+        Covered by running layout tests with TSan in:
+            http/tests/privateClickMeasurement/
+
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::parsePrivateClickMeasurement const):
+        - Add WTFMove() for updated SourceSite constructor.  Verified
+          that this doesn't create a use-after-move issue.
+
+        * loader/PrivateClickMeasurement.h:
+        (WebCore::PrivateClickMeasurement::SourceSite::SourceSite):
+        - Change to take rvalue reference for efficiency and to match
+          AttributionDestinationSite constructor.
+        (WebCore::PrivateClickMeasurement::SourceSite::isolatedCopy const): Add.
+        (WebCore::PrivateClickMeasurement::AttributionDestinationSite::isolatedCopy const): Add.
+        - Add isolatedCopy() methods to use in multi-threaded scenarios.
+
</ins><span class="cx"> 2021-08-15  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Remove shadow related SVG functionality
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (281065 => 281066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp  2021-08-15 19:02:34 UTC (rev 281065)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp     2021-08-15 20:05:28 UTC (rev 281066)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx">         return std::nullopt;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    auto privateClickMeasurement = PrivateClickMeasurement { SourceID(attributionSourceID.value()), SourceSite(documentRegistrableDomain), AttributionDestinationSite(destinationURL) };
</del><ins>+    auto privateClickMeasurement = PrivateClickMeasurement { SourceID(attributionSourceID.value()), SourceSite(WTFMove(documentRegistrableDomain)), AttributionDestinationSite(destinationURL) };
</ins><span class="cx"> 
</span><span class="cx">     auto attributionSourceNonceAttr = attributeWithoutSynchronization(attributionsourcenonceAttr);
</span><span class="cx">     if (!attributionSourceNonceAttr.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPrivateClickMeasurementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PrivateClickMeasurement.h (281065 => 281066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PrivateClickMeasurement.h    2021-08-15 19:02:34 UTC (rev 281065)
+++ trunk/Source/WebCore/loader/PrivateClickMeasurement.h       2021-08-15 20:05:28 UTC (rev 281066)
</span><span class="lines">@@ -78,11 +78,13 @@
</span><span class="cx">         {
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        explicit SourceSite(const RegistrableDomain& domain)
-            : registrableDomain { domain }
</del><ins>+        explicit SourceSite(RegistrableDomain&& domain)
+            : registrableDomain { WTFMove(domain) }
</ins><span class="cx">         {
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        SourceSite isolatedCopy() const { return SourceSite { registrableDomain.isolatedCopy() }; }
+
</ins><span class="cx">         bool operator==(const SourceSite& other) const
</span><span class="cx">         {
</span><span class="cx">             return registrableDomain == other.registrableDomain;
</span><span class="lines">@@ -121,7 +123,9 @@
</span><span class="cx">             : registrableDomain { WTFMove(domain) }
</span><span class="cx">         {
</span><span class="cx">         }
</span><del>-        
</del><ins>+
+        AttributionDestinationSite isolatedCopy() const { return AttributionDestinationSite { registrableDomain.isolatedCopy() }; }
+
</ins><span class="cx">         bool operator==(const AttributionDestinationSite& other) const
</span><span class="cx">         {
</span><span class="cx">             return registrableDomain == other.registrableDomain;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (281065 => 281066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-15 19:02:34 UTC (rev 281065)
+++ trunk/Source/WebKit/ChangeLog       2021-08-15 20:05:28 UTC (rev 281066)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-08-15  David Kilzer  <ddkilzer@apple.com>
+
+        Bug 229112: ThreadSanitizer: data races of WTF::String in WebResourceLoadStatisticsStore
+        <https://webkit.org/b/229112>
+        <rdar://problem/81940951>
+
+        Reviewed by Kate Cheney.
+
+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::WebResourceLoadStatisticsStore::attributePrivateClickMeasurement):
+        - Make isolated copies of sourceSite and destinationSite to fix
+          data races.
+        (WebKit::WebResourceLoadStatisticsStore::privateClickMeasurementToString):
+        - Make isolated copy of WTF::String to fix data race.
+
</ins><span class="cx"> 2021-08-14  Said Abou-Hallawa  <said@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [GPU Process] REGRESSION: WebContent often crashes when opening a Google spreadsheet with charts
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessClassifierWebResourceLoadStatisticsStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp (281065 => 281066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp 2021-08-15 19:02:34 UTC (rev 281065)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp    2021-08-15 20:05:28 UTC (rev 281066)
</span><span class="lines">@@ -1509,7 +1509,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    postTask([this, sourceSite, destinationSite, attributionTriggerData = WTFMove(attributionTriggerData), completionHandler = WTFMove(completionHandler)]() mutable {
</del><ins>+    postTask([this, sourceSite = sourceSite.isolatedCopy(), destinationSite = destinationSite.isolatedCopy(), attributionTriggerData = WTFMove(attributionTriggerData), completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx">         if (!m_statisticsStore) {
</span><span class="cx">             postTaskReply([completionHandler = WTFMove(completionHandler)]() mutable {
</span><span class="cx">                 completionHandler(std::nullopt);
</span><span class="lines">@@ -1611,7 +1611,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         auto result = m_statisticsStore->privateClickMeasurementToString();
</span><del>-        postTaskReply([result, completionHandler = WTFMove(completionHandler)]() mutable {
</del><ins>+        postTaskReply([result = result.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx">             completionHandler(result);
</span><span class="cx">         });
</span><span class="cx">     });
</span></span></pre>
</div>
</div>

</body>
</html>