Diff
Modified: trunk/Source/WebKit/ChangeLog (287197 => 287198)
--- trunk/Source/WebKit/ChangeLog 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/ChangeLog 2021-12-17 19:29:42 UTC (rev 287198)
@@ -1,3 +1,41 @@
+2021-12-17 Alex Christensen <[email protected]>
+
+ Remove API::Object::Type::BundlePageGroup
+ https://bugs.webkit.org/show_bug.cgi?id=225611
+
+ Reviewed by Brady Eidson.
+
+ Its last use was removed in rdar://77775952 and rdar://78783988
+
+ * Shared/API/APIObject.h:
+ * Shared/API/APIPageGroupHandle.cpp: Removed.
+ * Shared/API/APIPageGroupHandle.h: Removed.
+ * Shared/API/c/cg/WKImageCG.cpp:
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+ * Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp:
+ * Sources.txt:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::transformHandlesToObjects):
+ (WebKit::WebProcessProxy::transformObjectsToHandles):
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h:
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm:
+ (-[WKWebProcessPlugInPageGroup identifier]): Deleted.
+ (-[WKWebProcessPlugInPageGroup dealloc]): Deleted.
+ (-[WKWebProcessPlugInPageGroup _apiObject]): Deleted.
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h: Removed.
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h:
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+ (-[WKWebProcessPlugInBrowserContextController pageGroup]): Deleted.
+ * WebProcess/WebPage/WebPageGroupProxy.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::transformHandlesToObjects):
+ (WebKit::WebProcess::transformObjectsToHandles):
+
2021-12-17 Chris Dumez <[email protected]>
Move storage managers from the NetworkProcess to the NetworkSession class
Modified: trunk/Source/WebKit/Shared/API/APIObject.h (287197 => 287198)
--- trunk/Source/WebKit/Shared/API/APIObject.h 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/Shared/API/APIObject.h 2021-12-17 19:29:42 UTC (rev 287198)
@@ -66,9 +66,7 @@
Error,
FrameHandle,
Image,
- PageGroupData,
PageHandle,
- PageGroupHandle,
ProtectionSpace,
RenderLayer,
RenderObject,
@@ -203,7 +201,6 @@
BundleNodeHandle,
BundlePage,
BundlePageBanner,
- BundlePageGroup,
BundlePageOverlay,
BundleRangeHandle,
BundleScriptWorld,
@@ -318,9 +315,7 @@
API::Object::Type::Error,
API::Object::Type::FrameHandle,
API::Object::Type::Image,
- API::Object::Type::PageGroupData,
API::Object::Type::PageHandle,
- API::Object::Type::PageGroupHandle,
API::Object::Type::ProtectionSpace,
API::Object::Type::ResourceLoadInfo,
API::Object::Type::SecurityOrigin,
@@ -453,7 +448,6 @@
API::Object::Type::BundleNodeHandle,
API::Object::Type::BundlePage,
API::Object::Type::BundlePageBanner,
- API::Object::Type::BundlePageGroup,
API::Object::Type::BundlePageOverlay,
API::Object::Type::BundleRangeHandle,
API::Object::Type::BundleScriptWorld,
Deleted: trunk/Source/WebKit/Shared/API/APIPageGroupHandle.cpp (287197 => 287198)
--- trunk/Source/WebKit/Shared/API/APIPageGroupHandle.cpp 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/Shared/API/APIPageGroupHandle.cpp 2021-12-17 19:29:42 UTC (rev 287198)
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#include "config.h"
-#include "APIPageGroupHandle.h"
-
-#include "ArgumentCoders.h"
-#include "Decoder.h"
-#include "Encoder.h"
-
-namespace API {
-
-Ref<PageGroupHandle> PageGroupHandle::create(WebKit::WebPageGroupData&& webPageGroupData)
-{
- return adoptRef(*new PageGroupHandle(WTFMove(webPageGroupData)));
-}
-
-PageGroupHandle::PageGroupHandle(WebKit::WebPageGroupData&& webPageGroupData)
- : m_webPageGroupData(WTFMove(webPageGroupData))
-{
-}
-
-PageGroupHandle::~PageGroupHandle()
-{
-}
-
-void PageGroupHandle::encode(IPC::Encoder& encoder) const
-{
- encoder << m_webPageGroupData;
-}
-
-bool PageGroupHandle::decode(IPC::Decoder& decoder, RefPtr<Object>& result)
-{
- std::optional<WebKit::WebPageGroupData> webPageGroupData;
- decoder >> webPageGroupData;
- if (!webPageGroupData)
- return false;
-
- result = create(WTFMove(*webPageGroupData));
- return true;
-}
-
-}
Deleted: trunk/Source/WebKit/Shared/API/APIPageGroupHandle.h (287197 => 287198)
--- trunk/Source/WebKit/Shared/API/APIPageGroupHandle.h 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/Shared/API/APIPageGroupHandle.h 2021-12-17 19:29:42 UTC (rev 287198)
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#ifndef APIPageGroupHandle_h
-#define APIPageGroupHandle_h
-
-#include "APIObject.h"
-#include "WebPageGroupData.h"
-#include <wtf/RefPtr.h>
-
-namespace IPC {
-class Decoder;
-class Encoder;
-}
-
-namespace API {
-
-class PageGroupHandle : public ObjectImpl<Object::Type::PageGroupHandle> {
-public:
- static Ref<PageGroupHandle> create(WebKit::WebPageGroupData&&);
- virtual ~PageGroupHandle();
-
- const WebKit::WebPageGroupData& webPageGroupData() const { return m_webPageGroupData; }
-
- void encode(IPC::Encoder&) const;
- static WARN_UNUSED_RETURN bool decode(IPC::Decoder&, RefPtr<Object>&);
-
-private:
- explicit PageGroupHandle(WebKit::WebPageGroupData&&);
-
- const WebKit::WebPageGroupData m_webPageGroupData;
-};
-
-} // namespace API
-
-
-#endif // APIPageGroupHandle_h
Modified: trunk/Source/WebKit/Shared/API/c/cg/WKImageCG.cpp (287197 => 287198)
--- trunk/Source/WebKit/Shared/API/c/cg/WKImageCG.cpp 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/Shared/API/c/cg/WKImageCG.cpp 2021-12-17 19:29:42 UTC (rev 287198)
@@ -28,6 +28,7 @@
#include "ShareableBitmap.h"
#include "WKSharedAPICast.h"
+#include "WKString.h"
#include "WebImage.h"
#include <WebCore/ColorSpace.h>
#include <WebCore/GraphicsContext.h>
Modified: trunk/Source/WebKit/Shared/Cocoa/APIObject.mm (287197 => 287198)
--- trunk/Source/WebKit/Shared/Cocoa/APIObject.mm 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/Shared/Cocoa/APIObject.mm 2021-12-17 19:29:42 UTC (rev 287198)
@@ -63,7 +63,6 @@
#import "WKWebProcessPlugInHitTestResultInternal.h"
#import "WKWebProcessPlugInInternal.h"
#import "WKWebProcessPlugInNodeHandleInternal.h"
-#import "WKWebProcessPlugInPageGroupInternal.h"
#import "WKWebProcessPlugInRangeHandleInternal.h"
#import "WKWebProcessPlugInScriptWorldInternal.h"
#import "WKWebpagePreferencesInternal.h"
@@ -427,12 +426,6 @@
wrapper = [WKWebProcessPlugInNodeHandle alloc];
break;
- case Type::BundlePageGroup:
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN;
- wrapper = [WKWebProcessPlugInPageGroup alloc];
- ALLOW_DEPRECATED_DECLARATIONS_END;
- break;
-
case Type::BundleRangeHandle:
wrapper = [WKWebProcessPlugInRangeHandle alloc];
break;
Modified: trunk/Source/WebKit/Shared/UserData.cpp (287197 => 287198)
--- trunk/Source/WebKit/Shared/UserData.cpp 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/Shared/UserData.cpp 2021-12-17 19:29:42 UTC (rev 287198)
@@ -33,7 +33,6 @@
#include "APIFrameHandle.h"
#include "APIGeometry.h"
#include "APINumber.h"
-#include "APIPageGroupHandle.h"
#include "APIPageHandle.h"
#include "APISerializedScriptValue.h"
#include "APIString.h"
@@ -230,10 +229,6 @@
break;
}
- case API::Object::Type::PageGroupHandle:
- static_cast<const API::PageGroupHandle&>(object).encode(encoder);
- break;
-
case API::Object::Type::PageHandle:
static_cast<const API::PageHandle&>(object).encode(encoder);
break;
@@ -415,11 +410,6 @@
result = nullptr;
break;
- case API::Object::Type::PageGroupHandle:
- if (!API::PageGroupHandle::decode(decoder, result))
- return false;
- break;
-
case API::Object::Type::PageHandle:
if (!API::PageHandle::decode(decoder, result))
return false;
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp (287197 => 287198)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp 2021-12-17 19:29:42 UTC (rev 287198)
@@ -28,6 +28,7 @@
#if ENABLE(WEBM_FORMAT_READER)
+#include <WebCore/SharedBuffer.h>
#include <pal/cf/CoreMediaSoftLink.h>
namespace WebKit {
Modified: trunk/Source/WebKit/Sources.txt (287197 => 287198)
--- trunk/Source/WebKit/Sources.txt 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/Sources.txt 2021-12-17 19:29:42 UTC (rev 287198)
@@ -286,7 +286,6 @@
Shared/API/APIFrameHandle.cpp
Shared/API/APIGeometry.cpp
Shared/API/APIObject.cpp
-Shared/API/APIPageGroupHandle.cpp
Shared/API/APIPageHandle.cpp
Shared/API/APIURLRequest.cpp
Shared/API/APIURLResponse.cpp
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (287197 => 287198)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2021-12-17 19:29:42 UTC (rev 287198)
@@ -27,7 +27,6 @@
#include "WebProcessProxy.h"
#include "APIFrameHandle.h"
-#include "APIPageGroupHandle.h"
#include "APIPageHandle.h"
#include "AuthenticatorManager.h"
#include "DataReference.h"
@@ -1361,7 +1360,6 @@
case API::Object::Type::PageHandle:
return static_cast<const API::PageHandle&>(object).isAutoconverting();
- case API::Object::Type::PageGroupHandle:
#if PLATFORM(COCOA)
case API::Object::Type::ObjCObjectGraph:
#endif
@@ -1379,9 +1377,6 @@
ASSERT(static_cast<API::FrameHandle&>(object).isAutoconverting());
return m_webProcessProxy.webFrame(static_cast<API::FrameHandle&>(object).frameID());
- case API::Object::Type::PageGroupHandle:
- return WebPageGroup::get(static_cast<API::PageGroupHandle&>(object).webPageGroupData().pageGroupID);
-
case API::Object::Type::PageHandle:
ASSERT(static_cast<API::PageHandle&>(object).isAutoconverting());
return m_webProcessProxy.webPage(static_cast<API::PageHandle&>(object).pageProxyID());
@@ -1429,9 +1424,6 @@
case API::Object::Type::Page:
return API::PageHandle::createAutoconverting(static_cast<const WebPageProxy&>(object).identifier(), static_cast<const WebPageProxy&>(object).webPageID());
- case API::Object::Type::PageGroup:
- return API::PageGroupHandle::create(WebPageGroupData(static_cast<const WebPageGroup&>(object).data()));
-
#if PLATFORM(COCOA)
case API::Object::Type::ObjCObjectGraph:
return transformObjectsToHandles(static_cast<ObjCObjectGraph&>(object));
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (287197 => 287198)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-12-17 19:29:42 UTC (rev 287198)
@@ -429,7 +429,6 @@
1F7506B81859165D00EC0FF7 /* WKWebProcessPlugInFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F01816B1858DC1500F92884 /* WKWebProcessPlugInFrameInternal.h */; };
1F7D36C118DA513F00D9D659 /* APIDownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */; };
1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */; };
263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 263172CE18B469490065B9C3 /* NativeWebTouchEvent.h */; };
2684054418B85A630022C38B /* VisibleContentRectUpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2684054218B85A630022C38B /* VisibleContentRectUpdateInfo.h */; };
2684055218B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */; };
@@ -2649,8 +2648,6 @@
1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaMap.messages.in; sourceTree = "<group>"; };
1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageAreaMapMessageReceiver.cpp; path = DerivedSources/WebKit/StorageAreaMapMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageAreaMapMessages.h; path = DerivedSources/WebKit/StorageAreaMapMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
- 1A3A73CB1A48C6D4007231B3 /* APIPageGroupHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIPageGroupHandle.cpp; sourceTree = "<group>"; };
- 1A3A73CC1A48C6D4007231B3 /* APIPageGroupHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIPageGroupHandle.h; sourceTree = "<group>"; };
1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesInternal.h; sourceTree = "<group>"; };
1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; };
1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; };
@@ -3394,7 +3391,6 @@
1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIDownloadClient.h; sourceTree = "<group>"; };
1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroup.h; sourceTree = "<group>"; };
1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInPageGroup.mm; sourceTree = "<group>"; };
- 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroupInternal.h; sourceTree = "<group>"; };
263172CE18B469490065B9C3 /* NativeWebTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebTouchEvent.h; sourceTree = "<group>"; };
26659AA0185FAAED004303DD /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
2684054218B85A630022C38B /* VisibleContentRectUpdateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisibleContentRectUpdateInfo.h; sourceTree = "<group>"; };
@@ -7881,7 +7877,6 @@
CEC8F9CA1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h */,
1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */,
1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */,
- 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */,
374942191DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.h */,
374942181DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.mm */,
3749421C1DF1FAB90033C19F /* WKWebProcessPlugInRangeHandleInternal.h */,
@@ -11763,8 +11758,6 @@
BC33DD671238464600360F3F /* APINumber.h */,
B63403F814910D57001070B5 /* APIObject.cpp */,
BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
- 1A3A73CB1A48C6D4007231B3 /* APIPageGroupHandle.cpp */,
- 1A3A73CC1A48C6D4007231B3 /* APIPageGroupHandle.h */,
1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */,
1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */,
F634445512A885C8000612D8 /* APISecurityOrigin.h */,
@@ -13980,7 +13973,6 @@
1F7506B61859165700EC0FF7 /* WKWebProcessPlugInNodeHandleInternal.h in Headers */,
CEC8F9CB1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h in Headers */,
1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */,
- 1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */,
BC04EFFC16E65AFB00E336F0 /* WKWebProcessPlugInPrivate.h in Headers */,
3749421B1DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.h in Headers */,
3749421D1DF1FAB90033C19F /* WKWebProcessPlugInRangeHandleInternal.h in Headers */,
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h (287197 => 287198)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h 2021-12-17 19:29:42 UTC (rev 287198)
@@ -27,9 +27,8 @@
#import <Foundation/Foundation.h>
+// FIXME: Remove this file once the staging code for rdar://77775952 is removed.
WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKWebProcessPlugInBrowserContextController._groupIdentifier", macos(10.10, 12.0), ios(8.0, 15.0))
@interface WKWebProcessPlugInPageGroup : NSObject
-@property (readonly) NSString *identifier;
-
@end
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm (287197 => 287198)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm 2021-12-17 19:29:42 UTC (rev 287198)
@@ -24,38 +24,12 @@
*/
#import "config.h"
-#import "WKWebProcessPlugInPageGroupInternal.h"
+#import "WKWebProcessPlugInPageGroup.h"
-#import "WKAPICast.h"
-#import "WKNSString.h"
-#import "WKRetainPtr.h"
-#import "WebPageGroupProxy.h"
-#import <WebCore/WebCoreObjCExtras.h>
+// FIXME: Remove this file once the staging code for rdar://77775952 is removed.
ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
-@implementation WKWebProcessPlugInPageGroup {
- API::ObjectStorage<WebKit::WebPageGroupProxy> _bundlePageGroup;
-}
+@implementation WKWebProcessPlugInPageGroup
ALLOW_DEPRECATED_IMPLEMENTATIONS_END
-- (NSString *)identifier
-{
- return _bundlePageGroup->identifier();
-}
-
-- (void)dealloc
-{
- if (WebCoreObjCScheduleDeallocateOnMainRunLoop(WKWebProcessPlugInPageGroup.class, self))
- return;
- _bundlePageGroup->~WebPageGroupProxy();
- [super dealloc];
-}
-
-#pragma mark WKObject protocol implementation
-
-- (API::Object&)_apiObject
-{
- return *_bundlePageGroup;
-}
-
@end
Deleted: trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h (287197 => 287198)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h 2021-12-17 19:29:42 UTC (rev 287198)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2013-2018 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 "WKWebProcessPlugInPageGroup.h"
-
-#import "WKBase.h"
-#import "WebPageGroupProxy.h"
-
-namespace WebKit {
-
-template<> struct WrapperTraits<WebPageGroupProxy> {
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- using WrapperClass = WKWebProcessPlugInPageGroup;
- ALLOW_DEPRECATED_DECLARATIONS_END
-};
-
-}
-
-@interface WKWebProcessPlugInPageGroup () <WKObject>
-@end
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h (287197 => 287198)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h 2021-12-17 19:29:42 UTC (rev 287198)
@@ -30,7 +30,6 @@
@class WKDOMDocument;
@class WKDOMRange;
@class WKWebProcessPlugInFrame;
-@class WKWebProcessPlugInPageGroup;
@protocol WKWebProcessPlugInLoadDelegate;
WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
@@ -42,8 +41,6 @@
@property (readonly) WKWebProcessPlugInFrame *mainFrame;
-@property (readonly) WKWebProcessPlugInPageGroup *pageGroup WK_API_DEPRECATED_WITH_REPLACEMENT("_groupIdentifier", macos(10.10, 12.0), ios(8.0, 15.0));
-
@property (weak) id <WKWebProcessPlugInLoadDelegate> loadDelegate;
@end
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (287197 => 287198)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2021-12-17 19:29:42 UTC (rev 287198)
@@ -48,10 +48,10 @@
#import "WKWebProcessPlugInFormDelegatePrivate.h"
#import "WKWebProcessPlugInLoadDelegate.h"
#import "WKWebProcessPlugInNodeHandleInternal.h"
-#import "WKWebProcessPlugInPageGroupInternal.h"
#import "WKWebProcessPlugInRangeHandleInternal.h"
#import "WKWebProcessPlugInScriptWorldInternal.h"
#import "WebPage.h"
+#import "WebPageGroupProxy.h"
#import "WebProcess.h"
#import "_WKRemoteObjectRegistryInternal.h"
#import "_WKRenderingProgressEventsInternal.h"
@@ -415,11 +415,6 @@
return wrapper(_page->mainWebFrame());
}
-- (WKWebProcessPlugInPageGroup *)pageGroup
-{
- return wrapper(*_page->pageGroup());
-}
-
#pragma mark WKObject protocol implementation
- (API::Object&)_apiObject
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h (287197 => 287198)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h 2021-12-17 19:29:42 UTC (rev 287198)
@@ -38,7 +38,7 @@
class WebUserContentController;
-class WebPageGroupProxy : public API::ObjectImpl<API::Object::Type::BundlePageGroup> {
+class WebPageGroupProxy : public RefCounted<WebPageGroupProxy> {
public:
static Ref<WebPageGroupProxy> create(const WebPageGroupData&);
virtual ~WebPageGroupProxy();
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (287197 => 287198)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2021-12-17 19:29:42 UTC (rev 287198)
@@ -27,7 +27,6 @@
#include "WebProcess.h"
#include "APIFrameHandle.h"
-#include "APIPageGroupHandle.h"
#include "APIPageHandle.h"
#include "AudioMediaStreamTrackRendererInternalUnitManager.h"
#include "AuthenticationManager.h"
@@ -1773,7 +1772,6 @@
case API::Object::Type::PageHandle:
return static_cast<const API::PageHandle&>(object).isAutoconverting();
- case API::Object::Type::PageGroupHandle:
#if PLATFORM(COCOA)
case API::Object::Type::ObjCObjectGraph:
#endif
@@ -1790,9 +1788,6 @@
case API::Object::Type::FrameHandle:
return m_webProcess.webFrame(static_cast<const API::FrameHandle&>(object).frameID());
- case API::Object::Type::PageGroupHandle:
- return m_webProcess.webPageGroup(static_cast<const API::PageGroupHandle&>(object).webPageGroupData());
-
case API::Object::Type::PageHandle:
return m_webProcess.webPage(static_cast<const API::PageHandle&>(object).webPageID());
@@ -1819,7 +1814,6 @@
switch (object.type()) {
case API::Object::Type::BundleFrame:
case API::Object::Type::BundlePage:
- case API::Object::Type::BundlePageGroup:
#if PLATFORM(COCOA)
case API::Object::Type::ObjCObjectGraph:
#endif
@@ -1839,13 +1833,6 @@
case API::Object::Type::BundlePage:
return API::PageHandle::createAutoconverting(static_cast<const WebPage&>(object).webPageProxyIdentifier(), static_cast<const WebPage&>(object).identifier());
- case API::Object::Type::BundlePageGroup: {
- WebPageGroupData pageGroupData;
- pageGroupData.pageGroupID = static_cast<const WebPageGroupProxy&>(object).pageGroupID();
-
- return API::PageGroupHandle::create(WTFMove(pageGroupData));
- }
-
#if PLATFORM(COCOA)
case API::Object::Type::ObjCObjectGraph:
return transformObjectsToHandles(static_cast<ObjCObjectGraph&>(object));
Modified: trunk/Tools/ChangeLog (287197 => 287198)
--- trunk/Tools/ChangeLog 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Tools/ChangeLog 2021-12-17 19:29:42 UTC (rev 287198)
@@ -1,3 +1,13 @@
+2021-12-17 Alex Christensen <[email protected]>
+
+ Remove API::Object::Type::BundlePageGroup
+ https://bugs.webkit.org/show_bug.cgi?id=225611
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp:
+ (TestWebKitAPI::TEST):
+
2021-12-17 Alexey Shvayka <[email protected]>
Tools/Scripts/run-perf-tests is failing on Speedometer2
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp (287197 => 287198)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp 2021-12-17 18:58:49 UTC (rev 287197)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp 2021-12-17 19:29:42 UTC (rev 287198)
@@ -84,7 +84,7 @@
{
WKRetainPtr<WKPageGroupRef> pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DOMWindowExtensionBasicPageGroup")));
- WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DOMWindowExtensionBasic", pageGroup.get()));
+ WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DOMWindowExtensionBasic"));
WKContextInjectedBundleClientV0 injectedBundleClient;
memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
