<!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>[282430] 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/282430">282430</a></dd>
<dt>Author</dt> <dd>don.olmstead@sony.com</dd>
<dt>Date</dt> <dd>2021-09-14 19:28:47 -0700 (Tue, 14 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Non-unified build fixes, mid September 2021 edition
https://bugs.webkit.org/show_bug.cgi?id=230110

Unreviewed non-unified build fixes.


Source/JavaScriptCore:

* runtime/TemporalPlainTimeConstructor.cpp:
* runtime/TemporalPlainTimePrototype.cpp:

Source/WebCore:

* css/calc/CSSCalcOperationNode.cpp:
* css/calc/CSSCalcPrimitiveValueNode.cpp:
* layout/formattingContexts/FormattingQuirks.cpp:
* layout/formattingContexts/inline/invalidation/InlineDamage.h:
* layout/formattingContexts/inline/invalidation/InlineInvalidation.h:
* loader/CrossOriginOpenerPolicy.cpp:
* loader/DocumentWriter.cpp:
* rendering/TextBoxPainter.cpp:

Source/WebKit:

* NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.h:
* NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp:
* NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp:
(WebKit::PCM::NetworkLoader::start):
* NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h:
* NetworkProcess/storage/OriginStorageManager.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTemporalPlainTimeConstructorcpp">trunk/Source/JavaScriptCore/runtime/TemporalPlainTimeConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTemporalPlainTimePrototypecpp">trunk/Source/JavaScriptCore/runtime/TemporalPlainTimePrototype.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecsscalcCSSCalcOperationNodecpp">trunk/Source/WebCore/css/calc/CSSCalcOperationNode.cpp</a></li>
<li><a href="#trunkSourceWebCorecsscalcCSSCalcPrimitiveValueNodecpp">trunk/Source/WebCore/css/calc/CSSCalcPrimitiveValueNode.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsFormattingQuirkscpp">trunk/Source/WebCore/layout/formattingContexts/FormattingQuirks.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineinvalidationInlineDamageh">trunk/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineinvalidationInlineInvalidationh">trunk/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.h</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginOpenerPolicycpp">trunk/Source/WebCore/loader/CrossOriginOpenerPolicy.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentWritercpp">trunk/Source/WebCore/loader/DocumentWriter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextBoxPaintercpp">trunk/Source/WebCore/rendering/TextBoxPainter.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementConnectionh">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementManagerProxycpp">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementNetworkLoadercpp">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementNetworkLoaderh">trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessstorageOriginStorageManagerh">trunk/Source/WebKit/NetworkProcess/storage/OriginStorageManager.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-09-14  Don Olmstead  <don.olmstead@sony.com>
+
+        Non-unified build fixes, mid September 2021 edition
+        https://bugs.webkit.org/show_bug.cgi?id=230110
+
+        Unreviewed non-unified build fixes.
+
+        * runtime/TemporalPlainTimeConstructor.cpp:
+        * runtime/TemporalPlainTimePrototype.cpp:
+
</ins><span class="cx"> 2021-09-14  Ross Kirsling  <ross.kirsling@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [Win] JSRemoteInspector.h missing stdint include
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTemporalPlainTimeConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TemporalPlainTimeConstructor.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TemporalPlainTimeConstructor.cpp     2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/JavaScriptCore/runtime/TemporalPlainTimeConstructor.cpp        2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TemporalPlainTimeConstructor.h"
</span><span class="cx"> 
</span><ins>+#include "IntlObjectInlines.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "TemporalPlainTime.h"
</span><span class="cx"> #include "TemporalPlainTimePrototype.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTemporalPlainTimePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TemporalPlainTimePrototype.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TemporalPlainTimePrototype.cpp       2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/JavaScriptCore/runtime/TemporalPlainTimePrototype.cpp  2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include "TemporalPlainTimePrototype.h"
</span><span class="cx"> 
</span><span class="cx"> #include "JSCInlines.h"
</span><ins>+#include "ObjectConstructor.h"
+#include "TemporalDuration.h"
</ins><span class="cx"> #include "TemporalPlainTime.h"
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/ChangeLog      2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-09-14  Don Olmstead  <don.olmstead@sony.com>
+
+        Non-unified build fixes, mid September 2021 edition
+        https://bugs.webkit.org/show_bug.cgi?id=230110
+
+        Unreviewed non-unified build fixes.
+
+        * css/calc/CSSCalcOperationNode.cpp:
+        * css/calc/CSSCalcPrimitiveValueNode.cpp:
+        * layout/formattingContexts/FormattingQuirks.cpp:
+        * layout/formattingContexts/inline/invalidation/InlineDamage.h:
+        * layout/formattingContexts/inline/invalidation/InlineInvalidation.h:
+        * loader/CrossOriginOpenerPolicy.cpp:
+        * loader/DocumentWriter.cpp:
+        * rendering/TextBoxPainter.cpp:
+
</ins><span class="cx"> 2021-09-14  John Wilander  <wilander@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Rename RESOURCE_LOAD_STATISTICS to INTELLIGENT_TRACKING_PREVENTION
</span></span></pre></div>
<a id="trunkSourceWebCorecsscalcCSSCalcOperationNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/calc/CSSCalcOperationNode.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/calc/CSSCalcOperationNode.cpp   2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/css/calc/CSSCalcOperationNode.cpp      2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CSSUnits.h"
</span><span class="cx"> #include "CalcExpressionOperation.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include <wtf/text/TextStream.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorecsscalcCSSCalcPrimitiveValueNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/calc/CSSCalcPrimitiveValueNode.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/calc/CSSCalcPrimitiveValueNode.cpp      2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/css/calc/CSSCalcPrimitiveValueNode.cpp 2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CSSPrimitiveValueMappings.h"
</span><span class="cx"> #include "CalcExpressionLength.h"
</span><span class="cx"> #include "CalcExpressionNumber.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include <wtf/text/TextStream.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsFormattingQuirkscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/FormattingQuirks.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/FormattingQuirks.cpp      2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/layout/formattingContexts/FormattingQuirks.cpp 2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "LayoutBox.h"
</span><span class="cx"> #include "LayoutBoxGeometry.h"
</span><span class="cx"> #include "LayoutInitialContainingBlock.h"
</span><ins>+#include "LayoutState.h"
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Layout {
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineinvalidationInlineDamageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h        2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h   2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Layout {
</span><span class="cx"> 
</span><ins>+class InlineInvalidation;
+
</ins><span class="cx"> class InlineDamage {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED_INLINE(InlineDamage);
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineinvalidationInlineInvalidationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.h (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.h  2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.h     2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -27,9 +27,17 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><ins>+#include <optional>
+
</ins><span class="cx"> namespace WebCore {
</span><ins>+
+class RenderStyle;
+
</ins><span class="cx"> namespace Layout {
</span><ins>+
+class Box;
</ins><span class="cx"> class InlineDamage;
</span><ins>+class InlineTextBox;
</ins><span class="cx"> 
</span><span class="cx"> class InlineInvalidation {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginOpenerPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginOpenerPolicy.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginOpenerPolicy.cpp  2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/loader/CrossOriginOpenerPolicy.cpp     2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -27,8 +27,11 @@
</span><span class="cx"> #include "CrossOriginOpenerPolicy.h"
</span><span class="cx"> 
</span><span class="cx"> #include "CrossOriginEmbedderPolicy.h"
</span><ins>+#include "FormData.h"
+#include "Frame.h"
</ins><span class="cx"> #include "HTTPHeaderNames.h"
</span><span class="cx"> #include "HTTPParsers.h"
</span><ins>+#include "Page.h"
</ins><span class="cx"> #include "PingLoader.h"
</span><span class="cx"> #include "ReportingEndpointsCache.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentWritercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentWriter.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentWriter.cpp   2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/loader/DocumentWriter.cpp      2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "DOMImplementation.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><ins>+#include "DocumentLoader.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="lines">@@ -45,6 +46,7 @@
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "SecurityOriginPolicy.h"
</span><ins>+#include "SecurityPolicy.h"
</ins><span class="cx"> #include "SegmentedString.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SinkDocument.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextBoxPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextBoxPainter.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextBoxPainter.cpp        2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebCore/rendering/TextBoxPainter.cpp   2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -27,9 +27,11 @@
</span><span class="cx"> 
</span><span class="cx"> #include "CompositionHighlight.h"
</span><span class="cx"> #include "Editor.h"
</span><ins>+#include "EventRegion.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "LegacyInlineTextBox.h"
</span><span class="cx"> #include "PaintInfo.h"
</span><ins>+#include "RenderBlock.h"
</ins><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "StyledMarkedText.h"
</span><span class="cx"> #include "TextPaintStyle.h"
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebKit/ChangeLog       2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-09-14  Don Olmstead  <don.olmstead@sony.com>
+
+        Non-unified build fixes, mid September 2021 edition
+        https://bugs.webkit.org/show_bug.cgi?id=230110
+
+        Unreviewed non-unified build fixes.
+
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.h:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp:
+        (WebKit::PCM::NetworkLoader::start):
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h:
+        * NetworkProcess/storage/OriginStorageManager.h:
+
</ins><span class="cx"> 2021-09-14  John Wilander  <wilander@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Rename RESOURCE_LOAD_STATISTICS to INTELLIGENT_TRACKING_PREVENTION
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.h (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.h   2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.h      2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include <wtf/CompletionHandler.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp       2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp  2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "PrivateClickMeasurementConnection.h"
</span><span class="cx"> #include "PrivateClickMeasurementDecoder.h"
</span><span class="cx"> #include "PrivateClickMeasurementEncoder.h"
</span><ins>+#include "WebCoreArgumentCoders.h"
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementNetworkLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp      2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp 2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include "PrivateClickMeasurementNetworkLoader.h"
</span><span class="cx"> 
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><ins>+#include <WebCore/ResourceError.h>
+#include <WebCore/ResourceResponse.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="lines">@@ -33,7 +35,7 @@
</span><span class="cx"> namespace PCM {
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><del>-void NetworkLoader::start(URL&&, RefPtr<JSON::Object>&&, PrivateClickMeasurement::PcmDataCarried, Callback&& completionHandler)
</del><ins>+void NetworkLoader::start(URL&&, RefPtr<JSON::Object>&&, WebCore::PrivateClickMeasurement::PcmDataCarried, Callback&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</span><span class="cx">     completionHandler({ }, { }, { });
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessPrivateClickMeasurementPrivateClickMeasurementNetworkLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h        2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h   2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include <WebCore/PrivateClickMeasurement.h>
</ins><span class="cx"> #include <wtf/CompletionHandler.h>
</span><span class="cx"> #include <wtf/JSONValues.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessstorageOriginStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/storage/OriginStorageManager.h (282429 => 282430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/storage/OriginStorageManager.h        2021-09-15 01:13:44 UTC (rev 282429)
+++ trunk/Source/WebKit/NetworkProcess/storage/OriginStorageManager.h   2021-09-15 02:28:47 UTC (rev 282430)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include <wtf/text/WTFString.h>
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="cx"> class OriginStorageManager {
</span></span></pre>
</div>
</div>

</body>
</html>