<!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>[278920] trunk/Source/WebKit</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/278920">278920</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2021-06-15 21:25:37 -0700 (Tue, 15 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove unused code on API::HTTPCookieStore
https://bugs.webkit.org/show_bug.cgi?id=227056

Reviewed by Brady Eidson.

The dust has settled a bit since <a href="http://trac.webkit.org/projects/webkit/changeset/267763">r267763</a>.
Let's clean up!

* SourcesCocoa.txt:
* UIProcess/API/APIHTTPCookieStore.cpp:
(API::HTTPCookieStore::unregisterObserver):
(API::HTTPCookieStore::cookieManagerDestroyed):
(API::HTTPCookieStore::flushDefaultUIProcessCookieStore): Deleted.
(API::HTTPCookieStore::getAllDefaultUIProcessCookieStoreCookies): Deleted.
(API::HTTPCookieStore::setCookieInDefaultUIProcessCookieStore): Deleted.
(API::HTTPCookieStore::deleteCookieFromDefaultUIProcessCookieStore): Deleted.
(API::HTTPCookieStore::startObservingChangesToDefaultUIProcessCookieStore): Deleted.
(API::HTTPCookieStore::stopObservingChangesToDefaultUIProcessCookieStore): Deleted.
(API::HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore): Deleted.
(API::HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore): Deleted.
* UIProcess/API/APIHTTPCookieStore.h:
* UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm: Removed.
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
* UIProcess/API/Cocoa/WKDownloadInternal.h:
* UIProcess/Cocoa/WebProcessProxyCocoa.mm:
(WebKit::WebProcessProxy::sendAudioComponentRegistrations):
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::handleClickForDataDetectionResult):
* UIProcess/WebProcessPool.h:
* WebKit.xcodeproj/project.pbxproj:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSourcesCocoatxt">trunk/Source/WebKit/SourcesCocoa.txt</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIAPIHTTPCookieStorecpp">trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIAPIHTTPCookieStoreh">trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKDownloadInternalh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadInternal.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebProcessProxyCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebViewImplmm">trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessPoolh">trunk/Source/WebKit/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaAPIHTTPCookieStoreCocoamm">trunk/Source/WebKit/UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/ChangeLog       2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2021-06-15  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unused code on API::HTTPCookieStore
+        https://bugs.webkit.org/show_bug.cgi?id=227056
+
+        Reviewed by Brady Eidson.
+
+        The dust has settled a bit since r267763.
+        Let's clean up!
+
+        * SourcesCocoa.txt:
+        * UIProcess/API/APIHTTPCookieStore.cpp:
+        (API::HTTPCookieStore::unregisterObserver):
+        (API::HTTPCookieStore::cookieManagerDestroyed):
+        (API::HTTPCookieStore::flushDefaultUIProcessCookieStore): Deleted.
+        (API::HTTPCookieStore::getAllDefaultUIProcessCookieStoreCookies): Deleted.
+        (API::HTTPCookieStore::setCookieInDefaultUIProcessCookieStore): Deleted.
+        (API::HTTPCookieStore::deleteCookieFromDefaultUIProcessCookieStore): Deleted.
+        (API::HTTPCookieStore::startObservingChangesToDefaultUIProcessCookieStore): Deleted.
+        (API::HTTPCookieStore::stopObservingChangesToDefaultUIProcessCookieStore): Deleted.
+        (API::HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore): Deleted.
+        (API::HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore): Deleted.
+        * UIProcess/API/APIHTTPCookieStore.h:
+        * UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm: Removed.
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        * UIProcess/API/Cocoa/WKDownloadInternal.h:
+        * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+        (WebKit::WebProcessProxy::sendAudioComponentRegistrations):
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::handleClickForDataDetectionResult):
+        * UIProcess/WebProcessPool.h:
+        * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2021-06-15  Said Abou-Hallawa  <said@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [GPU Process] ConcreteImageBuffer::baseTransform() returns incorrect transform for unaccelerated ImageBuffer
</span></span></pre></div>
<a id="trunkSourceWebKitSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/SourcesCocoa.txt (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/SourcesCocoa.txt     2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/SourcesCocoa.txt        2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -307,7 +307,6 @@
</span><span class="cx"> UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm
</span><span class="cx"> UIProcess/API/Cocoa/APIAttachmentCocoa.mm
</span><span class="cx"> UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
</span><del>-UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm
</del><span class="cx"> UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
</span><span class="cx"> UIProcess/API/Cocoa/LegacyBundleForClass.mm
</span><span class="cx"> UIProcess/API/Cocoa/NSAttributedString.mm
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIAPIHTTPCookieStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.cpp (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.cpp 2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.cpp    2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -171,9 +171,6 @@
</span><span class="cx">     if (m_observedCookieManagerProxy)
</span><span class="cx">         m_observedCookieManagerProxy->unregisterObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
</span><span class="cx"> 
</span><del>-    if (m_observingUIProcessCookies)
-        stopObservingChangesToDefaultUIProcessCookieStore();
-
</del><span class="cx">     if (m_processPoolCreationListenerIdentifier)
</span><span class="cx">         WebProcessPool::unregisterProcessPoolCreationListener(m_processPoolCreationListenerIdentifier);
</span><span class="cx"> 
</span><span class="lines">@@ -180,7 +177,6 @@
</span><span class="cx">     m_processPoolCreationListenerIdentifier = 0;
</span><span class="cx">     m_observedCookieManagerProxy = nullptr;
</span><span class="cx">     m_cookieManagerProxyObserver = nullptr;
</span><del>-    m_observingUIProcessCookies = false;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void HTTPCookieStore::cookiesDidChange()
</span><span class="lines">@@ -195,16 +191,5 @@
</span><span class="cx">     m_observedCookieManagerProxy = &m_owningDataStore->networkProcess().cookieManager();
</span><span class="cx">     m_observedCookieManagerProxy->registerObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
</span><span class="cx"> }
</span><del>-
-#if !PLATFORM(COCOA)
-void HTTPCookieStore::flushDefaultUIProcessCookieStore() { }
-Vector<WebCore::Cookie> HTTPCookieStore::getAllDefaultUIProcessCookieStoreCookies() { return { }; }
-void HTTPCookieStore::setCookieInDefaultUIProcessCookieStore(const WebCore::Cookie&) { }
-void HTTPCookieStore::deleteCookieFromDefaultUIProcessCookieStore(const WebCore::Cookie&) { }
-void HTTPCookieStore::startObservingChangesToDefaultUIProcessCookieStore(Function<void()>&&) { }
-void HTTPCookieStore::stopObservingChangesToDefaultUIProcessCookieStore() { }
-void HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore() { }
-void HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebCore::HTTPCookieAcceptPolicy) { }
-#endif
</del><span class="cx">     
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIAPIHTTPCookieStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.h (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.h   2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.h      2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -82,29 +82,19 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     HTTPCookieStore(WebKit::WebsiteDataStore&);
</span><del>-
-    void flushDefaultUIProcessCookieStore();
-    static Vector<WebCore::Cookie> getAllDefaultUIProcessCookieStoreCookies();
-    static void setCookieInDefaultUIProcessCookieStore(const WebCore::Cookie&);
-    static void deleteCookieFromDefaultUIProcessCookieStore(const WebCore::Cookie&);
-    void startObservingChangesToDefaultUIProcessCookieStore(Function<void()>&&);
-    void stopObservingChangesToDefaultUIProcessCookieStore();
-    void deleteCookiesInDefaultUIProcessCookieStore();
-    void setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebCore::HTTPCookieAcceptPolicy);
</del><span class="cx">     
</span><span class="cx">     // FIXME: This is a reference cycle.
</span><span class="cx">     Ref<WebKit::WebsiteDataStore> m_owningDataStore;
</span><ins>+
+    // FIXME: This should be a WeakHashSet.
</ins><span class="cx">     HashSet<Observer*> m_observers;
</span><span class="cx"> 
</span><ins>+    // FIXME: This should be a WeakPtr.
</ins><span class="cx">     WebKit::WebCookieManagerProxy* m_observedCookieManagerProxy { nullptr };
</span><span class="cx">     std::unique_ptr<APIWebCookieManagerProxyObserver> m_cookieManagerProxyObserver;
</span><del>-    bool m_observingUIProcessCookies { false };
</del><span class="cx"> 
</span><ins>+    // FIXME: This is always 0. Remove it and the code that is called when it wasn't zero before r267763.
</ins><span class="cx">     uint64_t m_processPoolCreationListenerIdentifier { 0 };
</span><del>-
-#if PLATFORM(COCOA)
-    std::unique_ptr<WebCore::CookieStorageObserver> m_defaultUIProcessObserver;
-#endif
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaAPIHTTPCookieStoreCocoamm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm       2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm  2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>-/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "APIHTTPCookieStore.h"
-
-#import "WebsiteDataStore.h"
-#import <WebCore/Cookie.h>
-#import <WebCore/CookieStorageObserver.h>
-#import <WebCore/HTTPCookieAcceptPolicy.h>
-#import <WebCore/HTTPCookieAcceptPolicyCocoa.h>
-#import <pal/spi/cf/CFNetworkSPI.h>
-#import <wtf/BlockPtr.h>
-#import <wtf/RunLoop.h>
-
-namespace API {
-
-void HTTPCookieStore::flushDefaultUIProcessCookieStore()
-{
-    [[NSHTTPCookieStorage sharedHTTPCookieStorage] _saveCookies];
-}
-
-Vector<WebCore::Cookie> HTTPCookieStore::getAllDefaultUIProcessCookieStoreCookies()
-{
-    NSArray<NSHTTPCookie *> *cookiesArray = [NSHTTPCookieStorage sharedHTTPCookieStorage].cookies;
-    Vector<WebCore::Cookie> cookiesVector;
-    cookiesVector.reserveInitialCapacity(cookiesArray.count);
-    for (NSHTTPCookie *cookie in cookiesArray)
-        cookiesVector.uncheckedAppend({ cookie });
-    return cookiesVector;
-}
-
-void HTTPCookieStore::setCookieInDefaultUIProcessCookieStore(const WebCore::Cookie& cookie)
-{
-    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookie:cookie];
-}
-
-void HTTPCookieStore::deleteCookieFromDefaultUIProcessCookieStore(const WebCore::Cookie& cookie)
-{
-    [[NSHTTPCookieStorage sharedHTTPCookieStorage] deleteCookie:cookie];
-}
-
-void HTTPCookieStore::startObservingChangesToDefaultUIProcessCookieStore(Function<void()>&& function)
-{
-    stopObservingChangesToDefaultUIProcessCookieStore();
-    m_defaultUIProcessObserver = makeUnique<WebCore::CookieStorageObserver>([NSHTTPCookieStorage sharedHTTPCookieStorage]);
-    m_defaultUIProcessObserver->startObserving(WTFMove(function));
-}
-
-void HTTPCookieStore::stopObservingChangesToDefaultUIProcessCookieStore()
-{
-    if (auto observer = std::exchange(m_defaultUIProcessObserver, nullptr))
-        observer->stopObserving();
-}
-
-void HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore()
-{
-    [[NSHTTPCookieStorage sharedHTTPCookieStorage] removeCookiesSinceDate:[NSDate distantPast]];
-}
-
-void HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebCore::HTTPCookieAcceptPolicy policy)
-{
-    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:toNSHTTPCookieAcceptPolicy(policy)];
-}
-
-} // namespace API
</del></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm   2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm      2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> #import "WebProtectionSpace.h"
</span><span class="cx"> #import "_WKRemoteObjectRegistryInternal.h"
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><ins>+#import <wtf/BlockPtr.h>
</ins><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx"> #import <wtf/WeakObjCPtr.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKDownloadInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadInternal.h (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadInternal.h     2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadInternal.h        2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #import "DownloadProxy.h"
</span><span class="cx"> #import "WKDownload.h"
</span><span class="cx"> #import "WKObject.h"
</span><ins>+#import <wtf/WeakObjCPtr.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebProcessProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm      2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         RunLoop::main().dispatch([protectedThis = WTFMove(protectedThis), registrations = adoptCF(registrations)] () mutable {
</span><del>-            auto registrationData = SharedBuffer::create(registrations.get());
</del><ins>+            auto registrationData = WebCore::SharedBuffer::create(registrations.get());
</ins><span class="cx">             protectedThis->send(Messages::WebProcess::ConsumeAudioComponentRegistrations({ registrationData }), 0);
</span><span class="cx">         });
</span><span class="cx">     });
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm       2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm  2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -5804,7 +5804,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><span class="cx"> 
</span><del>-void WebViewImpl::handleClickForDataDetectionResult(const DataDetectorElementInfo& info, const IntPoint& clickLocation)
</del><ins>+void WebViewImpl::handleClickForDataDetectionResult(const WebCore::DataDetectorElementInfo& info, const WebCore::IntPoint& clickLocation)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(REVEAL)
</span><span class="cx">     m_revealItemPresenter = adoptNS([[WKRevealItemPresenter alloc] initWithWebViewImpl:*this item:adoptNS([PAL::allocRVItemInstance() initWithDDResult:info.result.get()]).get() frame:info.elementBounds menuLocation:clickLocation]);
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessPool.h   2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h      2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -300,7 +300,6 @@
</span><span class="cx">     static Statistics& statistics();    
</span><span class="cx"> 
</span><span class="cx">     void clearCachedCredentials(PAL::SessionID);
</span><del>-    void terminateNetworkProcess();
</del><span class="cx">     void terminateAllWebContentProcesses();
</span><span class="cx">     void sendNetworkProcessPrepareToSuspendForTesting(CompletionHandler<void()>&&);
</span><span class="cx">     void sendNetworkProcessWillSuspendImminentlyForTesting();
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (278919 => 278920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2021-06-16 03:58:50 UTC (rev 278919)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2021-06-16 04:25:37 UTC (rev 278920)
</span><span class="lines">@@ -4510,7 +4510,6 @@
</span><span class="cx">          5CA26D7F217ABBB600F97A35 /* WKSafeBrowsingWarning.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKSafeBrowsingWarning.mm; sourceTree = "<group>"; };
</span><span class="cx">          5CA26D80217ABBB600F97A35 /* WKSafeBrowsingWarning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSafeBrowsingWarning.h; sourceTree = "<group>"; };
</span><span class="cx">          5CA2F7472350E15400BE5194 /* NetworkSchemeRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkSchemeRegistry.h; sourceTree = "<group>"; };
</span><del>-               5CA46E7A21F1A23900CE86B4 /* APIHTTPCookieStoreCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = APIHTTPCookieStoreCocoa.mm; path = UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm; sourceTree = SOURCE_ROOT; };
</del><span class="cx">           5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SafeBrowsingWarning.h; sourceTree = "<group>"; };
</span><span class="cx">          5CA9854B210BEB730057EB6B /* SafeBrowsingWarningCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SafeBrowsingWarningCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx">          5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIMessageListener.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7910,7 +7909,6 @@
</span><span class="cx">          3754D5411B3A2998003A4C7F /* Cocoa */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><del>-                               3155EE0C2673F4EF0085E59A /* VisionKitSPI.h */,
</del><span class="cx">                           E3CAAA432413278A00CED2E2 /* AccessibilitySupportSPI.h */,
</span><span class="cx">                          572EBBDC25392181000552B3 /* AppAttestSPI.h */,
</span><span class="cx">                          57FABB0E25817CF00059DC95 /* AuthenticationServicesCoreSPI.h */,
</span><span class="lines">@@ -7924,6 +7922,7 @@
</span><span class="cx">                          5CB6AE432609799C00B6ED5A /* ReasonSPI.h */,
</span><span class="cx">                          0E97D74C200E8FF300BF6643 /* SafeBrowsingSPI.h */,
</span><span class="cx">                          448AC24D267135A600B28921 /* SynapseSPI.h */,
</span><ins>+                               3155EE0C2673F4EF0085E59A /* VisionKitSPI.h */,
</ins><span class="cx">                   );
</span><span class="cx">                  path = Cocoa;
</span><span class="cx">                  sourceTree = "<group>";
</span><span class="lines">@@ -8117,7 +8116,6 @@
</span><span class="cx">                          41C5378F21F1362D008B1FAD /* _WKWebsiteDataStoreDelegate.h */,
</span><span class="cx">                          F41056612130699A0092281D /* APIAttachmentCocoa.mm */,
</span><span class="cx">                          7CEFA9601AC0999300B910FD /* APIContentRuleListStoreCocoa.mm */,
</span><del>-                               5CA46E7A21F1A23900CE86B4 /* APIHTTPCookieStoreCocoa.mm */,
</del><span class="cx">                           FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */,
</span><span class="cx">                          1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */,
</span><span class="cx">                          1C20935E22318CB000026A39 /* NSAttributedString.h */,
</span><span class="lines">@@ -12038,7 +12036,6 @@
</span><span class="cx">                          93B2614E227D14B100B97A76 /* LocalStorageDatabase.h in Headers */,
</span><span class="cx">                          93B2614F227D14B100B97A76 /* LocalStorageDatabaseTracker.h in Headers */,
</span><span class="cx">                          46BEB6DB22FB9D4800269867 /* LocalStorageNamespace.h in Headers */,
</span><del>-                               3155EE0D2673F4F00085E59A /* VisionKitSPI.h in Headers */,
</del><span class="cx">                           51A7F2F3125BF820008AEB1D /* Logging.h in Headers */,
</span><span class="cx">                          0FDCD7F71D47E92A009F08BC /* LogInitialization.h in Headers */,
</span><span class="cx">                          1A6D86C21DF75265007745E8 /* MachMessage.h in Headers */,
</span><span class="lines">@@ -12378,6 +12375,7 @@
</span><span class="cx">                          2684055318B86ED60022C38B /* ViewUpdateDispatcherMessages.h in Headers */,
</span><span class="cx">                          2684054418B85A630022C38B /* VisibleContentRectUpdateInfo.h in Headers */,
</span><span class="cx">                          2DD5A7291EBF08D5009BA597 /* VisibleWebPageCounter.h in Headers */,
</span><ins>+                               3155EE0D2673F4F00085E59A /* VisionKitSPI.h in Headers */,
</ins><span class="cx">                           1A0F29E4120B44420053D1B9 /* VisitedLinkStore.h in Headers */,
</span><span class="cx">                          1A60224D18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h in Headers */,
</span><span class="cx">                          1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */,
</span></span></pre>
</div>
</div>

</body>
</html>