Diff
Modified: trunk/Source/WebKit/ChangeLog (278919 => 278920)
--- 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)
@@ -1,3 +1,36 @@
+2021-06-15 Alex Christensen <achristen...@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:
+
2021-06-15 Said Abou-Hallawa <s...@apple.com>
[GPU Process] ConcreteImageBuffer::baseTransform() returns incorrect transform for unaccelerated ImageBuffer
Modified: trunk/Source/WebKit/SourcesCocoa.txt (278919 => 278920)
--- 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)
@@ -307,7 +307,6 @@
UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm
UIProcess/API/Cocoa/APIAttachmentCocoa.mm
UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
-UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm
UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
UIProcess/API/Cocoa/LegacyBundleForClass.mm
UIProcess/API/Cocoa/NSAttributedString.mm
Modified: trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.cpp (278919 => 278920)
--- 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)
@@ -171,9 +171,6 @@
if (m_observedCookieManagerProxy)
m_observedCookieManagerProxy->unregisterObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
- if (m_observingUIProcessCookies)
- stopObservingChangesToDefaultUIProcessCookieStore();
-
if (m_processPoolCreationListenerIdentifier)
WebProcessPool::unregisterProcessPoolCreationListener(m_processPoolCreationListenerIdentifier);
@@ -180,7 +177,6 @@
m_processPoolCreationListenerIdentifier = 0;
m_observedCookieManagerProxy = nullptr;
m_cookieManagerProxyObserver = nullptr;
- m_observingUIProcessCookies = false;
}
void HTTPCookieStore::cookiesDidChange()
@@ -195,16 +191,5 @@
m_observedCookieManagerProxy = &m_owningDataStore->networkProcess().cookieManager();
m_observedCookieManagerProxy->registerObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
}
-
-#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
} // namespace API
Modified: trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.h (278919 => 278920)
--- 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)
@@ -82,29 +82,19 @@
private:
HTTPCookieStore(WebKit::WebsiteDataStore&);
-
- 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);
// FIXME: This is a reference cycle.
Ref<WebKit::WebsiteDataStore> m_owningDataStore;
+
+ // FIXME: This should be a WeakHashSet.
HashSet<Observer*> m_observers;
+ // FIXME: This should be a WeakPtr.
WebKit::WebCookieManagerProxy* m_observedCookieManagerProxy { nullptr };
std::unique_ptr<APIWebCookieManagerProxyObserver> m_cookieManagerProxyObserver;
- bool m_observingUIProcessCookies { false };
+ // FIXME: This is always 0. Remove it and the code that is called when it wasn't zero before r267763.
uint64_t m_processPoolCreationListenerIdentifier { 0 };
-
-#if PLATFORM(COCOA)
- std::unique_ptr<WebCore::CookieStorageObserver> m_defaultUIProcessObserver;
-#endif
};
}
Deleted: trunk/Source/WebKit/UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm (278919 => 278920)
--- 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)
@@ -1,88 +0,0 @@
-/*
- * 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
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm (278919 => 278920)
--- 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)
@@ -57,6 +57,7 @@
#import "WebProtectionSpace.h"
#import "_WKRemoteObjectRegistryInternal.h"
#import <WebCore/WebCoreObjCExtras.h>
+#import <wtf/BlockPtr.h>
#import <wtf/NeverDestroyed.h>
#import <wtf/WeakObjCPtr.h>
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadInternal.h (278919 => 278920)
--- 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)
@@ -26,6 +26,7 @@
#import "DownloadProxy.h"
#import "WKDownload.h"
#import "WKObject.h"
+#import <wtf/WeakObjCPtr.h>
namespace WebKit {
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (278919 => 278920)
--- 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)
@@ -278,7 +278,7 @@
return;
RunLoop::main().dispatch([protectedThis = WTFMove(protectedThis), registrations = adoptCF(registrations)] () mutable {
- auto registrationData = SharedBuffer::create(registrations.get());
+ auto registrationData = WebCore::SharedBuffer::create(registrations.get());
protectedThis->send(Messages::WebProcess::ConsumeAudioComponentRegistrations({ registrationData }), 0);
});
});
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (278919 => 278920)
--- 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)
@@ -5804,7 +5804,7 @@
#if ENABLE(DATA_DETECTION)
-void WebViewImpl::handleClickForDataDetectionResult(const DataDetectorElementInfo& info, const IntPoint& clickLocation)
+void WebViewImpl::handleClickForDataDetectionResult(const WebCore::DataDetectorElementInfo& info, const WebCore::IntPoint& clickLocation)
{
#if ENABLE(REVEAL)
m_revealItemPresenter = adoptNS([[WKRevealItemPresenter alloc] initWithWebViewImpl:*this item:adoptNS([PAL::allocRVItemInstance() initWithDDResult:info.result.get()]).get() frame:info.elementBounds menuLocation:clickLocation]);
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (278919 => 278920)
--- 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)
@@ -300,7 +300,6 @@
static Statistics& statistics();
void clearCachedCredentials(PAL::SessionID);
- void terminateNetworkProcess();
void terminateAllWebContentProcesses();
void sendNetworkProcessPrepareToSuspendForTesting(CompletionHandler<void()>&&);
void sendNetworkProcessWillSuspendImminentlyForTesting();
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (278919 => 278920)
--- 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)
@@ -4510,7 +4510,6 @@
5CA26D7F217ABBB600F97A35 /* WKSafeBrowsingWarning.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKSafeBrowsingWarning.mm; sourceTree = "<group>"; };
5CA26D80217ABBB600F97A35 /* WKSafeBrowsingWarning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSafeBrowsingWarning.h; sourceTree = "<group>"; };
5CA2F7472350E15400BE5194 /* NetworkSchemeRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkSchemeRegistry.h; sourceTree = "<group>"; };
- 5CA46E7A21F1A23900CE86B4 /* APIHTTPCookieStoreCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = APIHTTPCookieStoreCocoa.mm; path = UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm; sourceTree = SOURCE_ROOT; };
5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SafeBrowsingWarning.h; sourceTree = "<group>"; };
5CA9854B210BEB730057EB6B /* SafeBrowsingWarningCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SafeBrowsingWarningCocoa.mm; sourceTree = "<group>"; };
5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIMessageListener.h; sourceTree = "<group>"; };
@@ -7910,7 +7909,6 @@
3754D5411B3A2998003A4C7F /* Cocoa */ = {
isa = PBXGroup;
children = (
- 3155EE0C2673F4EF0085E59A /* VisionKitSPI.h */,
E3CAAA432413278A00CED2E2 /* AccessibilitySupportSPI.h */,
572EBBDC25392181000552B3 /* AppAttestSPI.h */,
57FABB0E25817CF00059DC95 /* AuthenticationServicesCoreSPI.h */,
@@ -7924,6 +7922,7 @@
5CB6AE432609799C00B6ED5A /* ReasonSPI.h */,
0E97D74C200E8FF300BF6643 /* SafeBrowsingSPI.h */,
448AC24D267135A600B28921 /* SynapseSPI.h */,
+ 3155EE0C2673F4EF0085E59A /* VisionKitSPI.h */,
);
path = Cocoa;
sourceTree = "<group>";
@@ -8117,7 +8116,6 @@
41C5378F21F1362D008B1FAD /* _WKWebsiteDataStoreDelegate.h */,
F41056612130699A0092281D /* APIAttachmentCocoa.mm */,
7CEFA9601AC0999300B910FD /* APIContentRuleListStoreCocoa.mm */,
- 5CA46E7A21F1A23900CE86B4 /* APIHTTPCookieStoreCocoa.mm */,
FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */,
1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */,
1C20935E22318CB000026A39 /* NSAttributedString.h */,
@@ -12038,7 +12036,6 @@
93B2614E227D14B100B97A76 /* LocalStorageDatabase.h in Headers */,
93B2614F227D14B100B97A76 /* LocalStorageDatabaseTracker.h in Headers */,
46BEB6DB22FB9D4800269867 /* LocalStorageNamespace.h in Headers */,
- 3155EE0D2673F4F00085E59A /* VisionKitSPI.h in Headers */,
51A7F2F3125BF820008AEB1D /* Logging.h in Headers */,
0FDCD7F71D47E92A009F08BC /* LogInitialization.h in Headers */,
1A6D86C21DF75265007745E8 /* MachMessage.h in Headers */,
@@ -12378,6 +12375,7 @@
2684055318B86ED60022C38B /* ViewUpdateDispatcherMessages.h in Headers */,
2684054418B85A630022C38B /* VisibleContentRectUpdateInfo.h in Headers */,
2DD5A7291EBF08D5009BA597 /* VisibleWebPageCounter.h in Headers */,
+ 3155EE0D2673F4F00085E59A /* VisionKitSPI.h in Headers */,
1A0F29E4120B44420053D1B9 /* VisitedLinkStore.h in Headers */,
1A60224D18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h in Headers */,
1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */,
