<!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>[284544] 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/284544">284544</a></dd>
<dt>Author</dt> <dd>ross.kirsling@sony.com</dd>
<dt>Date</dt> <dd>2021-10-20 10:22:08 -0700 (Wed, 20 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Mac CMake build should not need to include iOS headers
https://bugs.webkit.org/show_bug.cgi?id=231998

Reviewed by Alex Christensen.

Source/WebCore:

* PlatformMac.cmake:
* platform/ios/WebItemProviderPasteboard.h:

Source/WebCore/PAL:

* pal/PlatformMac.cmake:

Source/WebKit:

* GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm:
* PlatformMac.cmake:
* Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
* Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h:
* Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::encode const):
(WebKit::RemoteLayerTreeTransaction::decode):
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h:
* UIProcess/API/Cocoa/WKWebViewTesting.mm:
* UIProcess/Cocoa/UIDelegate.mm:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalPlatformMaccmake">trunk/Source/WebCore/PAL/pal/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebItemProviderPasteboardh">trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitGPUProcesscocoaGPUConnectionToWebProcessCocoamm">trunk/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitSharedRemoteLayerTreeRemoteLayerTreePropertyAppliermm">trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm</a></li>
<li><a href="#trunkSourceWebKitSharedRemoteLayerTreeRemoteLayerTreeTransactionh">trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h</a></li>
<li><a href="#trunkSourceWebKitSharedRemoteLayerTreeRemoteLayerTreeTransactionmm">trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewPrivateForTestingh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewTestingmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaUIDelegatemm">trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxyh">trunk/Source/WebKit/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPageh">trunk/Source/WebKit/WebProcess/WebPage/WebPage.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/ChangeLog      2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-10-20  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Mac CMake build should not need to include iOS headers
+        https://bugs.webkit.org/show_bug.cgi?id=231998
+
+        Reviewed by Alex Christensen.
+
+        * PlatformMac.cmake:
+        * platform/ios/WebItemProviderPasteboard.h:
+
</ins><span class="cx"> 2021-10-20  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         fast/images/text-recognition/mac/select-rotated-transparent-image-overlay.html is failing
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/PAL/ChangeLog  2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2021-10-20  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Mac CMake build should not need to include iOS headers
+        https://bugs.webkit.org/show_bug.cgi?id=231998
+
+        Reviewed by Alex Christensen.
+
+        * pal/PlatformMac.cmake:
+
</ins><span class="cx"> 2021-10-19  David Kilzer  <ddkilzer@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r284220): [PAL] TCCSPI.h should be a project header, not a private header
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake   2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake      2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx">     cocoa/UsageTrackingSoftLink.h
</span><span class="cx">     cocoa/VisionKitCoreSoftLink.h
</span><span class="cx"> 
</span><del>-    ios/SystemStatusSoftLink.h
-
</del><span class="cx">     mac/DataDetectorsSoftLink.h
</span><span class="cx">     mac/LookupSoftLink.h
</span><span class="cx">     mac/QuickLookUISoftLink.h
</span><span class="lines">@@ -97,9 +95,6 @@
</span><span class="cx">     spi/cocoa/WebFilterEvaluatorSPI.h
</span><span class="cx">     spi/cocoa/pthreadSPI.h
</span><span class="cx"> 
</span><del>-    spi/ios/DataDetectorsUISPI.h
-    spi/ios/GraphicsServicesSPI.h
-
</del><span class="cx">     spi/mac/CoreUISPI.h
</span><span class="cx">     spi/mac/DataDetectorsSPI.h
</span><span class="cx">     spi/mac/HIServicesSPI.h
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake   2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/PlatformMac.cmake      2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx">     "${WEBCORE_DIR}/bridge/objc"
</span><span class="cx">     "${WEBCORE_DIR}/crypto/mac"
</span><span class="cx">     "${WEBCORE_DIR}/editing/cocoa"
</span><del>-    "${WEBCORE_DIR}/editing/ios"
</del><span class="cx">     "${WEBCORE_DIR}/editing/mac"
</span><span class="cx">     "${WEBCORE_DIR}/html/shadow/cocoa"
</span><span class="cx">     "${WEBCORE_DIR}/layout/tableformatting"
</span><span class="lines">@@ -134,7 +133,6 @@
</span><span class="cx">     "${WEBCORE_DIR}/platform/mediastream/mac"
</span><span class="cx">     "${WEBCORE_DIR}/platform/network/cocoa"
</span><span class="cx">     "${WEBCORE_DIR}/platform/network/cf"
</span><del>-    "${WEBCORE_DIR}/platform/network/ios"
</del><span class="cx">     "${WEBCORE_DIR}/platform/network/mac"
</span><span class="cx">     "${WEBCORE_DIR}/platform/text/cf"
</span><span class="cx">     "${WEBCORE_DIR}/platform/text/cocoa"
</span><span class="lines">@@ -142,7 +140,6 @@
</span><span class="cx">     "${WEBCORE_DIR}/platform/spi/cf"
</span><span class="cx">     "${WEBCORE_DIR}/platform/spi/cg"
</span><span class="cx">     "${WEBCORE_DIR}/platform/spi/cocoa"
</span><del>-    "${WEBCORE_DIR}/platform/spi/ios"
</del><span class="cx">     "${WEBCORE_DIR}/platform/spi/mac"
</span><span class="cx">     "${WEBCORE_DIR}/plugins/mac"
</span><span class="cx">     "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
</span><span class="lines">@@ -583,8 +580,6 @@
</span><span class="cx">     platform/audio/cocoa/MediaSessionManagerCocoa.h
</span><span class="cx">     platform/audio/cocoa/WebAudioBufferList.h
</span><span class="cx"> 
</span><del>-    platform/audio/ios/MediaSessionManagerIOS.h
-
</del><span class="cx">     platform/audio/mac/SharedRoutingArbitrator.h
</span><span class="cx"> 
</span><span class="cx">     platform/cf/MediaAccessibilitySoftLink.h
</span><span class="lines">@@ -680,13 +675,6 @@
</span><span class="cx">     platform/graphics/mac/SwitchingGPUClient.h
</span><span class="cx">     platform/graphics/mac/WebLayer.h
</span><span class="cx"> 
</span><del>-    platform/ios/LocalizedDeviceModel.h
-    platform/ios/PlaybackSessionInterfaceAVKit.h
-    platform/ios/WebAVPlayerController.h
-
-    platform/ios/wak/FloatingPointEnvironment.h
-    platform/ios/wak/WebCoreThreadRun.h
-
</del><span class="cx">     platform/mac/DynamicLinkerInterposing.h
</span><span class="cx">     platform/mac/HIDDevice.h
</span><span class="cx">     platform/mac/HIDElement.h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebItemProviderPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h    2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h       2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -23,7 +23,9 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> #import <WebCore/AbstractPasteboard.h>
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> #if TARGET_OS_IOS
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/ChangeLog       2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-10-20  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Mac CMake build should not need to include iOS headers
+        https://bugs.webkit.org/show_bug.cgi?id=231998
+
+        Reviewed by Alex Christensen.
+
+        * GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm:
+        * PlatformMac.cmake:
+        * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
+        * Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h:
+        * Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm:
+        (WebKit::RemoteLayerTreeTransaction::encode const):
+        (WebKit::RemoteLayerTreeTransaction::decode):
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h:
+        * UIProcess/API/Cocoa/WKWebViewTesting.mm:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        * UIProcess/WebPageProxy.h:
+        * WebProcess/WebPage/WebPage.h:
+
</ins><span class="cx"> 2021-10-20  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Don't re-evaluate viewport dependent media queries if the viewport doesn't change
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcesscocoaGPUConnectionToWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm   2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm      2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(GPU_PROCESS)
</span><span class="cx"> 
</span><span class="cx"> #import "MediaPermissionUtilities.h"
</span><del>-#import "SystemStatusSPI.h"
</del><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/RealtimeMediaSourceCenter.h>
</span><span class="cx"> #import <WebCore/RegistrableDomain.h>
</span><span class="lines">@@ -37,9 +36,13 @@
</span><span class="cx"> #import <pal/spi/cocoa/LaunchServicesSPI.h>
</span><span class="cx"> #import <wtf/OSObjectPtr.h>
</span><span class="cx"> 
</span><del>-#import "TCCSoftLink.h"
</del><ins>+#if HAVE(SYSTEM_STATUS)
+#import "SystemStatusSPI.h"
</ins><span class="cx"> #import <pal/ios/SystemStatusSoftLink.h>
</span><ins>+#endif
</ins><span class="cx"> 
</span><ins>+#import "TCCSoftLink.h"
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake    2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/PlatformMac.cmake       2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/API/C/mac"
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/API/Cocoa"
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/API/mac"
</span><del>-    "${WEBKIT_DIR}/UIProcess/API/ios"
</del><span class="cx">     "${WEBKIT_DIR}/UIProcess/Authentication/cocoa"
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/Cocoa"
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/Cocoa/SOAuthorization"
</span><span class="lines">@@ -115,10 +114,8 @@
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/PDF"
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/cocoa"
</span><del>-    "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios"
</del><span class="cx">     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/mac"
</span><span class="cx">     "${WEBKIT_DIR}/UIProcess/WebAuthentication/Cocoa"
</span><del>-    "${WEBKIT_DIR}/UIProcess/ios"
</del><span class="cx">     "${WEBKIT_DIR}/Platform/cg"
</span><span class="cx">     "${WEBKIT_DIR}/Platform/classifier"
</span><span class="cx">     "${WEBKIT_DIR}/Platform/classifier/cocoa"
</span><span class="lines">@@ -126,7 +123,6 @@
</span><span class="cx">     "${WEBKIT_DIR}/Platform/mac"
</span><span class="cx">     "${WEBKIT_DIR}/Platform/unix"
</span><span class="cx">     "${WEBKIT_DIR}/Platform/spi/Cocoa"
</span><del>-    "${WEBKIT_DIR}/Platform/spi/ios"
</del><span class="cx">     "${WEBKIT_DIR}/Platform/spi/mac"
</span><span class="cx">     "${WEBKIT_DIR}/Platform/IPC/mac"
</span><span class="cx">     "${WEBKIT_DIR}/Platform/IPC/cocoa"
</span><span class="lines">@@ -137,7 +133,6 @@
</span><span class="cx">     "${WEBKIT_DIR}/Shared/API/c/mac"
</span><span class="cx">     "${WEBKIT_DIR}/Shared/ApplePay/cocoa/"
</span><span class="cx">     "${WEBKIT_DIR}/Shared/Authentication/cocoa"
</span><del>-    "${WEBKIT_DIR}/Shared/ios"
</del><span class="cx">     "${WEBKIT_DIR}/Shared/cf"
</span><span class="cx">     "${WEBKIT_DIR}/Shared/Cocoa"
</span><span class="cx">     "${WEBKIT_DIR}/Shared/Daemon"
</span><span class="lines">@@ -227,8 +222,6 @@
</span><span class="cx"> list(APPEND WebKit_MESSAGES_IN_FILES
</span><span class="cx">     GPUProcess/media/RemoteImageDecoderAVFProxy
</span><span class="cx"> 
</span><del>-    GPUProcess/media/ios/RemoteMediaSessionHelperProxy
-
</del><span class="cx">     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager
</span><span class="cx"> 
</span><span class="cx">     Shared/API/Cocoa/RemoteObjectRegistry
</span><span class="lines">@@ -261,8 +254,6 @@
</span><span class="cx"> 
</span><span class="cx">     WebProcess/GPU/media/RemoteImageDecoderAVFManager
</span><span class="cx"> 
</span><del>-    WebProcess/GPU/media/ios/RemoteMediaSessionHelper
-
</del><span class="cx">     WebProcess/Inspector/WebInspectorUIExtensionController
</span><span class="cx"> 
</span><span class="cx">     WebProcess/WebAuthentication/WebAuthnProcessConnection
</span><span class="lines">@@ -501,8 +492,6 @@
</span><span class="cx">     UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h
</span><span class="cx">     UIProcess/API/Cocoa/_WKWebsiteDataStoreDelegate.h
</span><span class="cx"> 
</span><del>-    UIProcess/API/ios/WKWebViewPrivateForTestingIOS.h
-
</del><span class="cx">     UIProcess/API/mac/WKWebViewPrivateForTestingMac.h
</span><span class="cx"> 
</span><span class="cx">     UIProcess/Cocoa/WKShareSheet.h
</span><span class="lines">@@ -559,7 +548,6 @@
</span><span class="cx">     UIProcess/API/C/Cocoa
</span><span class="cx">     UIProcess/API/C/mac
</span><span class="cx">     UIProcess/API/cpp
</span><del>-    UIProcess/API/ios
</del><span class="cx"> 
</span><span class="cx">     WebProcess/InjectedBundle/API/Cocoa
</span><span class="cx">     WebProcess/InjectedBundle/API/c
</span></span></pre></div>
<a id="trunkSourceWebKitSharedRemoteLayerTreeRemoteLayerTreePropertyAppliermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm     2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm        2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #import "PlatformCAAnimationRemote.h"
</span><span class="cx"> #import "PlatformCALayerRemote.h"
</span><span class="cx"> #import "RemoteLayerTreeHost.h"
</span><del>-#import "RemoteLayerTreeViews.h"
</del><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx"> #import <WebCore/PlatformCAFilters.h>
</span><span class="cx"> #import <WebCore/ScrollbarThemeMac.h>
</span><span class="lines">@@ -46,6 +45,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><ins>+#import "RemoteLayerTreeViews.h"
</ins><span class="cx"> #import <UIKit/UIView.h>
</span><span class="cx"> #import <UIKitSPI.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitSharedRemoteLayerTreeRemoteLayerTreeTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h  2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h     2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include "DrawingAreaInfo.h"
</span><del>-#include "DynamicViewportSizeUpdate.h"
</del><span class="cx"> #include "EditorState.h"
</span><span class="cx"> #include "GenericCallback.h"
</span><span class="cx"> #include "PlatformCAAnimationRemote.h"
</span><span class="lines">@@ -45,6 +44,10 @@
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
+#include "DynamicViewportSizeUpdate.h"
+#endif
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx"> class Decoder;
</span><span class="cx"> class Encoder;
</span><span class="lines">@@ -305,9 +308,11 @@
</span><span class="cx">     const EditorState& editorState() const { return m_editorState.value(); }
</span><span class="cx">     void setEditorState(const EditorState& editorState) { m_editorState = editorState; }
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
</ins><span class="cx">     std::optional<DynamicViewportSizeUpdateID> dynamicViewportSizeUpdateID() const { return m_dynamicViewportSizeUpdateID; }
</span><span class="cx">     void setDynamicViewportSizeUpdateID(DynamicViewportSizeUpdateID resizeID) { m_dynamicViewportSizeUpdateID = resizeID; }
</span><del>-    
</del><ins>+#endif
+
</ins><span class="cx"> private:
</span><span class="cx">     WebCore::GraphicsLayer::PlatformLayerID m_rootLayerID;
</span><span class="cx">     Vector<RefPtr<PlatformCALayerRemote>> m_changedLayers; // Only used in the Web process.
</span><span class="lines">@@ -346,7 +351,9 @@
</span><span class="cx">     bool m_isInStableState { false };
</span><span class="cx"> 
</span><span class="cx">     std::optional<EditorState> m_editorState;
</span><ins>+#if PLATFORM(IOS_FAMILY)
</ins><span class="cx">     std::optional<DynamicViewportSizeUpdateID> m_dynamicViewportSizeUpdateID;
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitSharedRemoteLayerTreeRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm    2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -643,7 +643,9 @@
</span><span class="cx">     if (m_editorState)
</span><span class="cx">         encoder << *m_editorState;
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
</ins><span class="cx">     encoder << m_dynamicViewportSizeUpdateID;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool RemoteLayerTreeTransaction::decode(IPC::Decoder& decoder, RemoteLayerTreeTransaction& result)
</span><span class="lines">@@ -780,8 +782,10 @@
</span><span class="cx">         result.setEditorState(editorState);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
</ins><span class="cx">     if (!decoder.decode(result.m_dynamicViewportSizeUpdateID))
</span><span class="cx">         return false;
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">     return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm     2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm        2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -83,8 +83,6 @@
</span><span class="cx"> #import "WKUserContentControllerInternal.h"
</span><span class="cx"> #import "WKWebViewConfigurationInternal.h"
</span><span class="cx"> #import "WKWebViewContentProvider.h"
</span><del>-#import "WKWebViewPrivateForTestingIOS.h"
-#import "WKWebViewIOS.h"
</del><span class="cx"> #import "WKWebViewMac.h"
</span><span class="cx"> #import "WKWebpagePreferencesInternal.h"
</span><span class="cx"> #import "WKWebsiteDataStoreInternal.h"
</span><span class="lines">@@ -168,6 +166,8 @@
</span><span class="cx"> #import "WKContentViewInteraction.h"
</span><span class="cx"> #import "WKScrollView.h"
</span><span class="cx"> #import "WKWebViewContentProviderRegistry.h"
</span><ins>+#import "WKWebViewIOS.h"
+#import "WKWebViewPrivateForTestingIOS.h"
</ins><span class="cx"> #import <MobileCoreServices/MobileCoreServices.h>
</span><span class="cx"> #import <UIKit/UIApplication.h>
</span><span class="cx"> #import <pal/spi/cf/CFNotificationCenterSPI.h>
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewPrivateForTestingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h     2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h        2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -23,8 +23,11 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> #import "WKWebViewPrivateForTestingIOS.h"
</span><ins>+#else
</ins><span class="cx"> #import "WKWebViewPrivateForTestingMac.h"
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> NS_ASSUME_NONNULL_BEGIN
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewTestingmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm      2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm 2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #import "PlaybackSessionManagerProxy.h"
</span><span class="cx"> #import "UserMediaProcessManager.h"
</span><span class="cx"> #import "ViewGestureController.h"
</span><del>-#import "WKWebViewIOS.h"
</del><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebProcessPool.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="lines">@@ -42,6 +41,14 @@
</span><span class="cx"> #import <WebCore/ValidationBubble.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><ins>+#if PLATFORM(MAC)
+#import "WKWebViewMac.h"
+#endif
+
+#if PLATFORM(IOS_FAMILY)
+#import "WKWebViewIOS.h"
+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_SESSION_COORDINATOR)
</span><span class="cx"> @interface WKMediaSessionCoordinatorHelper : NSObject <_WKMediaSessionCoordinatorDelegate>
</span><span class="cx"> - (id)initWithCoordinator:(WebCore::MediaSessionCoordinatorClient*)coordinator;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm        2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm   2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #import "MediaUtilities.h"
</span><span class="cx"> #import "NativeWebWheelEvent.h"
</span><span class="cx"> #import "NavigationActionData.h"
</span><del>-#import "TapHandlingResult.h"
</del><span class="cx"> #import "UserMediaPermissionCheckProxy.h"
</span><span class="cx"> #import "UserMediaPermissionRequestManagerProxy.h"
</span><span class="cx"> #import "UserMediaPermissionRequestProxy.h"
</span><span class="lines">@@ -46,9 +45,8 @@
</span><span class="cx"> #import "WKOpenPanelParametersInternal.h"
</span><span class="cx"> #import "WKSecurityOriginInternal.h"
</span><span class="cx"> #import "WKStorageAccessAlert.h"
</span><del>-#import <WebKit/WKUIDelegatePrivate.h>
</del><ins>+#import "WKUIDelegatePrivate.h"
</ins><span class="cx"> #import "WKWebViewConfigurationInternal.h"
</span><del>-#import "WKWebViewIOS.h"
</del><span class="cx"> #import "WKWebViewInternal.h"
</span><span class="cx"> #import "WKWindowFeaturesInternal.h"
</span><span class="cx"> #import "WebEventFactory.h"
</span><span class="lines">@@ -67,6 +65,11 @@
</span><span class="cx"> #import <wtf/BlockPtr.h>
</span><span class="cx"> #import <wtf/URL.h>
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
+#import "TapHandlingResult.h"
+#import "WKWebViewIOS.h"
+#endif
+
</ins><span class="cx"> #import <pal/cocoa/AVFoundationSoftLink.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm       2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm  2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> #import "TextChecker.h"
</span><span class="cx"> #import "UserInterfaceIdiom.h"
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><del>-#import "WKMouseDeviceObserver.h"
-#import "WKStylusDeviceObserver.h"
</del><span class="cx"> #import "WebAuthnProcessMessages.h"
</span><span class="cx"> #import "WebAuthnProcessProxy.h"
</span><span class="cx"> #import "WebBackForwardCache.h"
</span><span class="lines">@@ -105,6 +103,14 @@
</span><span class="cx"> #import "GPUProcessMessages.h"
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if HAVE(MOUSE_DEVICE_OBSERVATION)
+#import "WKMouseDeviceObserver.h"
+#endif
+
+#if HAVE(STYLUS_DEVICE_OBSERVATION)
+#import "WKStylusDeviceObserver.h"
+#endif
+
</ins><span class="cx"> #if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</span><span class="cx"> #include <WebCore/CaptionUserPreferencesMediaAF.h>
</span><span class="cx"> #include <WebCore/MediaAccessibilitySoftLink.h>
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.h     2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h        2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -137,6 +137,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><ins>+#include "DynamicViewportSizeUpdate.h"
</ins><span class="cx"> #include "GestureTypes.h"
</span><span class="cx"> #include "WebAutocorrectionContext.h"
</span><span class="cx"> #include <WebCore/InspectorOverlay.h>
</span><span class="lines">@@ -155,7 +156,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#include "DynamicViewportSizeUpdate.h"
</del><span class="cx"> #include "RemoteLayerTreeNode.h"
</span><span class="cx"> #include <wtf/WeakObjCPtr.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (284543 => 284544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h    2021-10-20 17:22:08 UTC (rev 284544)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><ins>+#include "DynamicViewportSizeUpdate.h"
</ins><span class="cx"> #include "GestureTypes.h"
</span><span class="cx"> #include <WebCore/InspectorOverlay.h>
</span><span class="cx"> #include <WebCore/IntPointHash.h>
</span><span class="lines">@@ -159,7 +160,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#include "DynamicViewportSizeUpdate.h"
</del><span class="cx"> #include <WebCore/VisibleSelection.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS CALayer;
</span></span></pre>
</div>
</div>

</body>
</html>