Diff
Modified: trunk/Source/WebKit/ChangeLog (281781 => 281782)
--- trunk/Source/WebKit/ChangeLog 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/ChangeLog 2021-08-30 22:50:23 UTC (rev 281782)
@@ -1,5 +1,23 @@
2021-08-30 Alex Christensen <[email protected]>
+ Remove unused OptionalCallbackID
+ https://bugs.webkit.org/show_bug.cgi?id=229359
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/NetworkProcess.h:
+ * Shared/CallbackID.h:
+ * Shared/OptionalCallbackID.h: Removed.
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebCookieManagerProxy.cpp:
+ * UIProcess/WebPageProxy.cpp:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/EventDispatcher.h:
+ * WebProcess/WebPage/FindController.cpp:
+ * WebProcess/WebPage/WebPage.h:
+
+2021-08-30 Alex Christensen <[email protected]>
+
Update availability macros for APIs available in iOS 14.5 and macOS 11.3
https://bugs.webkit.org/show_bug.cgi?id=229466
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (281781 => 281782)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2021-08-30 22:50:23 UTC (rev 281782)
@@ -28,7 +28,6 @@
#include "AppPrivacyReport.h"
#include "AuxiliaryProcess.h"
#include "CacheModel.h"
-#include "CallbackID.h"
#include "DownloadID.h"
#include "DownloadManager.h"
#include "LocalStorageDatabaseTracker.h"
Modified: trunk/Source/WebKit/Shared/CallbackID.h (281781 => 281782)
--- trunk/Source/WebKit/Shared/CallbackID.h 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/Shared/CallbackID.h 2021-08-30 22:50:23 UTC (rev 281782)
@@ -100,7 +100,6 @@
friend class CallbackMap;
template <typename CallbackType> friend class SpecificCallbackMap;
- friend class OptionalCallbackID;
friend struct WTF::CallbackIDHash;
friend HashTraits<WebKit::CallbackID>;
Deleted: trunk/Source/WebKit/Shared/OptionalCallbackID.h (281781 => 281782)
--- trunk/Source/WebKit/Shared/OptionalCallbackID.h 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/Shared/OptionalCallbackID.h 2021-08-30 22:50:23 UTC (rev 281782)
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2017 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.
- */
-
-#pragma once
-
-#include "CallbackID.h"
-#include <wtf/HashTraits.h>
-#include <wtf/RunLoop.h>
-
-namespace WebKit {
-
-class OptionalCallbackID {
-public:
- explicit OptionalCallbackID() { }
-
- ALWAYS_INLINE explicit OptionalCallbackID(const CallbackID& otherID)
- : m_id(otherID.m_id)
- {
- }
-
- ALWAYS_INLINE OptionalCallbackID(const OptionalCallbackID& otherID)
- : m_id(otherID.m_id)
- {
- ASSERT(!HashTraits<uint64_t>::isDeletedValue(m_id));
- }
-
- ALWAYS_INLINE OptionalCallbackID& operator=(const OptionalCallbackID& otherID)
- {
- m_id = otherID.m_id;
- return *this;
- }
-
- uint64_t toInteger() { return m_id; }
- CallbackID callbackID()
- {
- RELEASE_ASSERT(CallbackID::isValidCallbackID(m_id));
- return CallbackID(m_id);
- }
-
- operator bool() { return m_id; }
-
- ALWAYS_INLINE bool isValid() const { return isValidCallbackID(m_id); }
- static ALWAYS_INLINE bool isValidCallbackID(uint64_t rawId)
- {
- return !HashTraits<uint64_t>::isDeletedValue(rawId);
- }
-
- template<class Encoder> void encode(Encoder& encoder) const
- {
- RELEASE_ASSERT(isValid());
- encoder << m_id;
- }
-
- template<class Decoder> static WARN_UNUSED_RETURN bool decode(Decoder& decoder, OptionalCallbackID& callbackID)
- {
- auto result = decoder.decode(callbackID.m_id);
- RELEASE_ASSERT(callbackID.isValid());
- return result;
- }
-
-private:
- uint64_t m_id { HashTraits<uint64_t>::emptyValue() };
-};
-
-}
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (281781 => 281782)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2021-08-30 22:50:23 UTC (rev 281782)
@@ -27,7 +27,6 @@
#include "AppPrivacyReport.h"
#include "AuxiliaryProcessProxy.h"
-#include "CallbackID.h"
#include "NetworkProcessProxyMessagesReplies.h"
#include "NetworkResourceLoadIdentifier.h"
#include "ProcessLauncher.h"
Modified: trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp (281781 => 281782)
--- trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp 2021-08-30 22:50:23 UTC (rev 281782)
@@ -30,7 +30,6 @@
#include "APISecurityOrigin.h"
#include "NetworkProcessMessages.h"
#include "NetworkProcessProxy.h"
-#include "OptionalCallbackID.h"
#include "WebCookieManagerMessages.h"
#include "WebCookieManagerProxyMessages.h"
#include "WebProcessPool.h"
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (281781 => 281782)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-08-30 22:50:23 UTC (rev 281782)
@@ -79,7 +79,6 @@
#include "NetworkProcessProxy.h"
#include "NotificationPermissionRequest.h"
#include "NotificationPermissionRequestManager.h"
-#include "OptionalCallbackID.h"
#include "PageClient.h"
#include "PluginInformation.h"
#include "PluginProcessManager.h"
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (281781 => 281782)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-08-30 22:50:23 UTC (rev 281782)
@@ -5082,7 +5082,6 @@
9B5BEC28240101580070C6EF /* RemoteAudioDestinationProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioDestinationProxy.h; sourceTree = "<group>"; };
9B5BEC29240101580070C6EF /* RemoteAudioDestinationProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioDestinationProxy.cpp; sourceTree = "<group>"; };
9BC59D6C1EFCCCB6001E8D09 /* CallbackID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallbackID.h; sourceTree = "<group>"; };
- 9BC59D6D1EFCDC6D001E8D09 /* OptionalCallbackID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionalCallbackID.h; sourceTree = "<group>"; };
9BD8AB4925820E52005386F8 /* FontReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontReference.h; sourceTree = "<group>"; };
9BF5EC6325410E9900984E77 /* JSIPCBinding.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSIPCBinding.cpp; sourceTree = "<group>"; };
9EC532A22447FBAD00215216 /* GeolocationIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeolocationIdentifier.h; sourceTree = "<group>"; };
@@ -6838,7 +6837,6 @@
1ADCB868189831B30022EE5A /* NavigationActionData.cpp */,
1ADCB869189831B30022EE5A /* NavigationActionData.h */,
5CD748B523C8EB190092A9B5 /* NetworkResourceLoadIdentifier.h */,
- 9BC59D6D1EFCDC6D001E8D09 /* OptionalCallbackID.h */,
7AFBD36E21E546E3005DBACB /* PersistencyUtils.cpp */,
7AFBD36D21E546E3005DBACB /* PersistencyUtils.h */,
BCC43AB8127B95DC00317F16 /* PlatformPopupMenuData.cpp */,
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h (281781 => 281782)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 2021-08-30 22:50:23 UTC (rev 281782)
@@ -30,7 +30,6 @@
#include "CallbackID.h"
#include "CompositingCoordinator.h"
#include "LayerTreeContext.h"
-#include "OptionalCallbackID.h"
#include "SimpleViewportController.h"
#include "ThreadedCompositor.h"
#include "ThreadedDisplayRefreshMonitor.h"
Modified: trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.h (281781 => 281782)
--- trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.h 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.h 2021-08-30 22:50:23 UTC (rev 281782)
@@ -25,7 +25,6 @@
#pragma once
-#include "CallbackID.h"
#include "Connection.h"
#include "WebEvent.h"
#include <WebCore/PageIdentifier.h>
Modified: trunk/Source/WebKit/WebProcess/WebPage/FindController.cpp (281781 => 281782)
--- trunk/Source/WebKit/WebProcess/WebPage/FindController.cpp 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/WebProcess/WebPage/FindController.cpp 2021-08-30 22:50:23 UTC (rev 281782)
@@ -26,7 +26,6 @@
#include "config.h"
#include "FindController.h"
-#include "CallbackID.h"
#include "DrawingArea.h"
#include "PluginView.h"
#include "ShareableBitmap.h"
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (281781 => 281782)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-08-30 22:45:43 UTC (rev 281781)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-08-30 22:50:23 UTC (rev 281782)
@@ -48,7 +48,6 @@
#include "MessageReceiver.h"
#include "MessageSender.h"
#include "NetworkResourceLoadIdentifier.h"
-#include "OptionalCallbackID.h"
#include "PDFPluginIdentifier.h"
#include "Plugin.h"
#include "PolicyDecision.h"
