<!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>[277614] trunk</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/277614">277614</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2021-05-17 16:24:23 -0700 (Mon, 17 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove API::Object::Type::BundlePageGroup
https://bugs.webkit.org/show_bug.cgi?id=225611

Reviewed by Brady Eidson.

Source/WebKit:

Its last use was removed in rdar://77775952

* Shared/API/APIObject.h:
* Shared/API/APIPageGroupHandle.cpp: Removed.
* Shared/API/APIPageGroupHandle.h: Removed.
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
* Shared/Cocoa/SharedRingBufferStorage.cpp:
(WebKit::SharedRingBufferStorage::setStorage):
(WebKit::SharedRingBufferStorage::allocate):
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):
* Shared/mac/MediaFormatReader/MediaSampleCursor.h:
* 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):

Tools:

Some tests were trying to encode a page group, but it was unused so I just removed them.

* TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit/InjectedBundleDisableOverrideBuiltinsBehavior.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit/InjectedBundleMakeAllShadowRootsOpen.cpp:
(TestWebKitAPI::TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedAPIAPIObjecth">trunk/Source/WebKit/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKitSharedCocoaAPIObjectmm">trunk/Source/WebKit/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKitSharedCocoaSharedRingBufferStoragecpp">trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedUserDatacpp">trunk/Source/WebKit/Shared/UserData.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedmacMediaFormatReaderMediaSampleCursorh">trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h</a></li>
<li><a href="#trunkSourceWebKitSourcestxt">trunk/Source/WebKit/Sources.txt</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessProxycpp">trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGrouph">trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGroupmm">trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh">trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm">trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPageGroupProxyh">trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebProcesscpp">trunk/Source/WebKit/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitDOMWindowExtensionBasiccpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitDocumentStartUserScriptAlertCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitInjectedBundleDisableOverrideBuiltinsBehaviorcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleDisableOverrideBuiltinsBehavior.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitInjectedBundleMakeAllShadowRootsOpencpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleMakeAllShadowRootsOpen.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitSharedAPIAPIPageGroupHandlecpp">trunk/Source/WebKit/Shared/API/APIPageGroupHandle.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedAPIAPIPageGroupHandleh">trunk/Source/WebKit/Shared/API/APIPageGroupHandle.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGroupInternalh">trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/ChangeLog       2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2021-05-17  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><ins>+        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
+
+        * Shared/API/APIObject.h:
+        * Shared/API/APIPageGroupHandle.cpp: Removed.
+        * Shared/API/APIPageGroupHandle.h: Removed.
+        * Shared/Cocoa/APIObject.mm:
+        (API::Object::newObject):
+        * Shared/Cocoa/SharedRingBufferStorage.cpp:
+        (WebKit::SharedRingBufferStorage::setStorage):
+        (WebKit::SharedRingBufferStorage::allocate):
+        * Shared/UserData.cpp:
+        (WebKit::UserData::encode):
+        (WebKit::UserData::decode):
+        * Shared/mac/MediaFormatReader/MediaSampleCursor.h:
+        * 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-05-17  Alex Christensen  <achristensen@webkit.org>
+
</ins><span class="cx">         [Cocoa] Remove prototype loadSimulatedRequest methods
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=223658
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitSharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/API/APIObject.h (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/API/APIObject.h       2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/Shared/API/APIObject.h  2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -66,9 +66,7 @@
</span><span class="cx">         Error,
</span><span class="cx">         FrameHandle,
</span><span class="cx">         Image,
</span><del>-        PageGroupData,
</del><span class="cx">         PageHandle,
</span><del>-        PageGroupHandle,
</del><span class="cx">         ProtectionSpace,
</span><span class="cx">         RenderLayer,
</span><span class="cx">         RenderObject,
</span><span class="lines">@@ -204,7 +202,6 @@
</span><span class="cx">         BundleNodeHandle,
</span><span class="cx">         BundlePage,
</span><span class="cx">         BundlePageBanner,
</span><del>-        BundlePageGroup,
</del><span class="cx">         BundlePageOverlay,
</span><span class="cx">         BundleRangeHandle,
</span><span class="cx">         BundleScriptWorld,
</span><span class="lines">@@ -319,9 +316,7 @@
</span><span class="cx">         API::Object::Type::Error,
</span><span class="cx">         API::Object::Type::FrameHandle,
</span><span class="cx">         API::Object::Type::Image,
</span><del>-        API::Object::Type::PageGroupData,
</del><span class="cx">         API::Object::Type::PageHandle,
</span><del>-        API::Object::Type::PageGroupHandle,
</del><span class="cx">         API::Object::Type::ProtectionSpace,
</span><span class="cx">         API::Object::Type::ResourceLoadInfo,
</span><span class="cx">         API::Object::Type::SecurityOrigin,
</span><span class="lines">@@ -455,7 +450,6 @@
</span><span class="cx">         API::Object::Type::BundleNodeHandle,
</span><span class="cx">         API::Object::Type::BundlePage,
</span><span class="cx">         API::Object::Type::BundlePageBanner,
</span><del>-        API::Object::Type::BundlePageGroup,
</del><span class="cx">         API::Object::Type::BundlePageOverlay,
</span><span class="cx">         API::Object::Type::BundleRangeHandle,
</span><span class="cx">         API::Object::Type::BundleScriptWorld,
</span></span></pre></div>
<a id="trunkSourceWebKitSharedAPIAPIPageGroupHandlecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/Shared/API/APIPageGroupHandle.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/API/APIPageGroupHandle.cpp    2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/Shared/API/APIPageGroupHandle.cpp       2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * 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)
-{
-    Optional<WebKit::WebPageGroupData> webPageGroupData;
-    decoder >> webPageGroupData;
-    if (!webPageGroupData)
-        return false;
-
-    result = create(WTFMove(*webPageGroupData));
-    return true;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebKitSharedAPIAPIPageGroupHandleh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/Shared/API/APIPageGroupHandle.h (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/API/APIPageGroupHandle.h      2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/Shared/API/APIPageGroupHandle.h 2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKitSharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/Cocoa/APIObject.mm (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/Cocoa/APIObject.mm    2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/Shared/Cocoa/APIObject.mm       2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> #import "WKWebProcessPlugInHitTestResultInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInNodeHandleInternal.h"
</span><del>-#import "WKWebProcessPlugInPageGroupInternal.h"
</del><span class="cx"> #import "WKWebProcessPlugInRangeHandleInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInScriptWorldInternal.h"
</span><span class="cx"> #import "WKWebpagePreferencesInternal.h"
</span><span class="lines">@@ -427,12 +426,6 @@
</span><span class="cx">         wrapper = [WKWebProcessPlugInNodeHandle alloc];
</span><span class="cx">         break;
</span><span class="cx"> 
</span><del>-    case Type::BundlePageGroup:
-        ALLOW_DEPRECATED_DECLARATIONS_BEGIN;
-        wrapper = [WKWebProcessPlugInPageGroup alloc];
-        ALLOW_DEPRECATED_DECLARATIONS_END;
-        break;
-
</del><span class="cx">     case Type::BundleRangeHandle:
</span><span class="cx">         wrapper = [WKWebProcessPlugInRangeHandle alloc];
</span><span class="cx">         break;
</span></span></pre></div>
<a id="trunkSourceWebKitSharedCocoaSharedRingBufferStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.cpp     2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.cpp        2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     m_endFrame = pair.second;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SharedRingBufferStorage::setStorage(RefPtr<SharedMemory>&& storage, const CAAudioStreamDescription& format, size_t frameCount)
</del><ins>+void SharedRingBufferStorage::setStorage(RefPtr<SharedMemory>&& storage, const WebCore::CAAudioStreamDescription& format, size_t frameCount)
</ins><span class="cx"> {
</span><span class="cx">     m_storage = WTFMove(storage);
</span><span class="cx">     if (m_storageChangedHandler)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">         m_storageChangedHandler(m_storage.get(), format, frameCount);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SharedRingBufferStorage::allocate(size_t byteCount, const CAAudioStreamDescription& format, size_t frameCount)
</del><ins>+void SharedRingBufferStorage::allocate(size_t byteCount, const WebCore::CAAudioStreamDescription& format, size_t frameCount)
</ins><span class="cx"> {
</span><span class="cx">     auto sharedMemory = SharedMemory::allocate(byteCount + sizeof(FrameBounds));
</span><span class="cx">     new (NotNull, sharedMemory->data()) FrameBounds;
</span></span></pre></div>
<a id="trunkSourceWebKitSharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/UserData.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/UserData.cpp  2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/Shared/UserData.cpp     2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "APIFrameHandle.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><del>-#include "APIPageGroupHandle.h"
</del><span class="cx"> #include "APIPageHandle.h"
</span><span class="cx"> #include "APISerializedScriptValue.h"
</span><span class="cx"> #include "APIString.h"
</span><span class="lines">@@ -230,10 +229,6 @@
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    case API::Object::Type::PageGroupHandle:
-        static_cast<const API::PageGroupHandle&>(object).encode(encoder);
-        break;
-
</del><span class="cx">     case API::Object::Type::PageHandle:
</span><span class="cx">         static_cast<const API::PageHandle&>(object).encode(encoder);
</span><span class="cx">         break;
</span><span class="lines">@@ -415,11 +410,6 @@
</span><span class="cx">         result = nullptr;
</span><span class="cx">         break;
</span><span class="cx"> 
</span><del>-    case API::Object::Type::PageGroupHandle:
-        if (!API::PageGroupHandle::decode(decoder, result))
-            return false;
-        break;
-
</del><span class="cx">     case API::Object::Type::PageHandle:
</span><span class="cx">         if (!API::PageHandle::decode(decoder, result))
</span><span class="cx">             return false;
</span></span></pre></div>
<a id="trunkSourceWebKitSharedmacMediaFormatReaderMediaSampleCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h     2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h        2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "CoreMediaWrapped.h"
</span><span class="cx"> #include <WebCore/SampleMap.h>
</span><ins>+#include <wtf/Identified.h>
</ins><span class="cx"> #include <wtf/MediaTime.h>
</span><span class="cx"> #include <wtf/Variant.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitSourcestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Sources.txt (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Sources.txt  2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/Sources.txt     2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -238,7 +238,6 @@
</span><span class="cx"> Shared/API/APIFrameHandle.cpp
</span><span class="cx"> Shared/API/APIGeometry.cpp
</span><span class="cx"> Shared/API/APIObject.cpp
</span><del>-Shared/API/APIPageGroupHandle.cpp
</del><span class="cx"> Shared/API/APIPageHandle.cpp
</span><span class="cx"> Shared/API/APIURLRequest.cpp
</span><span class="cx"> Shared/API/APIURLResponse.cpp
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp        2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp   2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> 
</span><span class="cx"> #include "APIFrameHandle.h"
</span><del>-#include "APIPageGroupHandle.h"
</del><span class="cx"> #include "APIPageHandle.h"
</span><span class="cx"> #include "AuthenticatorManager.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="lines">@@ -1340,7 +1339,6 @@
</span><span class="cx">             case API::Object::Type::PageHandle:
</span><span class="cx">                 return static_cast<const API::PageHandle&>(object).isAutoconverting();
</span><span class="cx"> 
</span><del>-            case API::Object::Type::PageGroupHandle:
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">             case API::Object::Type::ObjCObjectGraph:
</span><span class="cx"> #endif
</span><span class="lines">@@ -1358,9 +1356,6 @@
</span><span class="cx">                 ASSERT(static_cast<API::FrameHandle&>(object).isAutoconverting());
</span><span class="cx">                 return m_webProcessProxy.webFrame(static_cast<API::FrameHandle&>(object).frameID());
</span><span class="cx"> 
</span><del>-            case API::Object::Type::PageGroupHandle:
-                return WebPageGroup::get(static_cast<API::PageGroupHandle&>(object).webPageGroupData().pageGroupID);
-
</del><span class="cx">             case API::Object::Type::PageHandle:
</span><span class="cx">                 ASSERT(static_cast<API::PageHandle&>(object).isAutoconverting());
</span><span class="cx">                 return m_webProcessProxy.webPage(static_cast<API::PageHandle&>(object).pageProxyID());
</span><span class="lines">@@ -1408,9 +1403,6 @@
</span><span class="cx">             case API::Object::Type::Page:
</span><span class="cx">                 return API::PageHandle::createAutoconverting(static_cast<const WebPageProxy&>(object).identifier(), static_cast<const WebPageProxy&>(object).webPageID());
</span><span class="cx"> 
</span><del>-            case API::Object::Type::PageGroup:
-                return API::PageGroupHandle::create(WebPageGroupData(static_cast<const WebPageGroup&>(object).data()));
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">             case API::Object::Type::ObjCObjectGraph:
</span><span class="cx">                 return transformObjectsToHandles(static_cast<ObjCObjectGraph&>(object));
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -464,7 +464,6 @@
</span><span class="cx">          1F7506B81859165D00EC0FF7 /* WKWebProcessPlugInFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F01816B1858DC1500F92884 /* WKWebProcessPlugInFrameInternal.h */; };
</span><span class="cx">          1F7D36C118DA513F00D9D659 /* APIDownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */; };
</span><span class="cx">          1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-               1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */; };
</del><span class="cx">           263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 263172CE18B469490065B9C3 /* NativeWebTouchEvent.h */; };
</span><span class="cx">          2684054418B85A630022C38B /* VisibleContentRectUpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2684054218B85A630022C38B /* VisibleContentRectUpdateInfo.h */; };
</span><span class="cx">          2684055218B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */; };
</span><span class="lines">@@ -2653,8 +2652,6 @@
</span><span class="cx">          1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaMap.messages.in; sourceTree = "<group>"; };
</span><span class="cx">          1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageAreaMapMessageReceiver.cpp; path = DerivedSources/WebKit2/StorageAreaMapMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx">          1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageAreaMapMessages.h; path = DerivedSources/WebKit2/StorageAreaMapMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
</span><del>-               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>"; };
</del><span class="cx">           1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesInternal.h; sourceTree = "<group>"; };
</span><span class="cx">          1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; };
</span><span class="cx">          1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3109,7 +3106,6 @@
</span><span class="cx">          1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIDownloadClient.h; sourceTree = "<group>"; };
</span><span class="cx">          1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroup.h; sourceTree = "<group>"; };
</span><span class="cx">          1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInPageGroup.mm; sourceTree = "<group>"; };
</span><del>-               1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroupInternal.h; sourceTree = "<group>"; };
</del><span class="cx">           263172CE18B469490065B9C3 /* NativeWebTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebTouchEvent.h; sourceTree = "<group>"; };
</span><span class="cx">          26659AA0185FAAED004303DD /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
</span><span class="cx">          2684054218B85A630022C38B /* VisibleContentRectUpdateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisibleContentRectUpdateInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7219,7 +7215,6 @@
</span><span class="cx">                          CEC8F9CA1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h */,
</span><span class="cx">                          1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */,
</span><span class="cx">                          1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */,
</span><del>-                               1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */,
</del><span class="cx">                           374942191DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.h */,
</span><span class="cx">                          374942181DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.mm */,
</span><span class="cx">                          3749421C1DF1FAB90033C19F /* WKWebProcessPlugInRangeHandleInternal.h */,
</span><span class="lines">@@ -10862,8 +10857,6 @@
</span><span class="cx">                          BC33DD671238464600360F3F /* APINumber.h */,
</span><span class="cx">                          B63403F814910D57001070B5 /* APIObject.cpp */,
</span><span class="cx">                          BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
</span><del>-                               1A3A73CB1A48C6D4007231B3 /* APIPageGroupHandle.cpp */,
-                               1A3A73CC1A48C6D4007231B3 /* APIPageGroupHandle.h */,
</del><span class="cx">                           1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */,
</span><span class="cx">                          1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */,
</span><span class="cx">                          F634445512A885C8000612D8 /* APISecurityOrigin.h */,
</span><span class="lines">@@ -12958,7 +12951,6 @@
</span><span class="cx">                          1F7506B61859165700EC0FF7 /* WKWebProcessPlugInNodeHandleInternal.h in Headers */,
</span><span class="cx">                          CEC8F9CB1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h in Headers */,
</span><span class="cx">                          1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */,
</span><del>-                               1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */,
</del><span class="cx">                           BC04EFFC16E65AFB00E336F0 /* WKWebProcessPlugInPrivate.h in Headers */,
</span><span class="cx">                          3749421B1DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.h in Headers */,
</span><span class="cx">                          3749421D1DF1FAB90033C19F /* WKWebProcessPlugInRangeHandleInternal.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h    2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h       2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -27,9 +27,8 @@
</span><span class="cx"> 
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> 
</span><ins>+// FIXME: Remove this file once the staging code for rdar://77775952 is removed.
</ins><span class="cx"> WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKWebProcessPlugInBrowserContextController._groupIdentifier", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
</span><span class="cx"> @interface WKWebProcessPlugInPageGroup : NSObject
</span><span class="cx"> 
</span><del>-@property (readonly) NSString *identifier;
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm   2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm      2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -24,38 +24,12 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #import "config.h"
</span><del>-#import "WKWebProcessPlugInPageGroupInternal.h"
</del><ins>+#import "WKWebProcessPlugInPageGroup.h"
</ins><span class="cx"> 
</span><del>-#import "WKAPICast.h"
-#import "WKNSString.h"
-#import "WKRetainPtr.h"
-#import "WebPageGroupProxy.h"
-#import <WebCore/WebCoreObjCExtras.h>
</del><ins>+// FIXME: Remove this file once the staging code for rdar://77775952 is removed.
</ins><span class="cx"> 
</span><span class="cx"> ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
</span><del>-@implementation WKWebProcessPlugInPageGroup {
-    API::ObjectStorage<WebKit::WebPageGroupProxy> _bundlePageGroup;
-}
</del><ins>+@implementation WKWebProcessPlugInPageGroup
</ins><span class="cx"> ALLOW_DEPRECATED_IMPLEMENTATIONS_END
</span><span class="cx"> 
</span><del>-- (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;
-}
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGroupInternalh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h    2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroupInternal.h       2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h       2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h  2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> @class WKDOMDocument;
</span><span class="cx"> @class WKDOMRange;
</span><span class="cx"> @class WKWebProcessPlugInFrame;
</span><del>-@class WKWebProcessPlugInPageGroup;
</del><span class="cx"> @protocol WKWebProcessPlugInLoadDelegate;
</span><span class="cx"> 
</span><span class="cx"> WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
</span><span class="lines">@@ -42,8 +41,6 @@
</span><span class="cx"> 
</span><span class="cx"> @property (readonly) WKWebProcessPlugInFrame *mainFrame;
</span><span class="cx"> 
</span><del>-@property (readonly) WKWebProcessPlugInPageGroup *pageGroup WK_API_DEPRECATED_WITH_REPLACEMENT("_groupIdentifier", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
-
</del><span class="cx"> @property (weak) id <WKWebProcessPlugInLoadDelegate> loadDelegate;
</span><span class="cx"> 
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm      2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -48,10 +48,10 @@
</span><span class="cx"> #import "WKWebProcessPlugInFormDelegatePrivate.h"
</span><span class="cx"> #import "WKWebProcessPlugInLoadDelegate.h"
</span><span class="cx"> #import "WKWebProcessPlugInNodeHandleInternal.h"
</span><del>-#import "WKWebProcessPlugInPageGroupInternal.h"
</del><span class="cx"> #import "WKWebProcessPlugInRangeHandleInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInScriptWorldInternal.h"
</span><span class="cx"> #import "WebPage.h"
</span><ins>+#import "WebPageGroupProxy.h"
</ins><span class="cx"> #import "WebProcess.h"
</span><span class="cx"> #import "_WKRemoteObjectRegistryInternal.h"
</span><span class="cx"> #import "_WKRenderingProgressEventsInternal.h"
</span><span class="lines">@@ -404,11 +404,6 @@
</span><span class="cx">     return wrapper(_page->mainWebFrame());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (WKWebProcessPlugInPageGroup *)pageGroup
-{
-    return wrapper(*_page->pageGroup());
-}
-
</del><span class="cx"> #pragma mark WKObject protocol implementation
</span><span class="cx"> 
</span><span class="cx"> - (API::Object&)_apiObject
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPageGroupProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h       2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h  2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> 
</span><span class="cx"> class WebUserContentController;
</span><span class="cx"> 
</span><del>-class WebPageGroupProxy : public API::ObjectImpl<API::Object::Type::BundlePageGroup> {
</del><ins>+class WebPageGroupProxy : public RefCounted<WebPageGroupProxy> {
</ins><span class="cx"> public:
</span><span class="cx">     static Ref<WebPageGroupProxy> create(const WebPageGroupData&);
</span><span class="cx">     virtual ~WebPageGroupProxy();
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebProcess.cpp    2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp       2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> 
</span><span class="cx"> #include "APIFrameHandle.h"
</span><del>-#include "APIPageGroupHandle.h"
</del><span class="cx"> #include "APIPageHandle.h"
</span><span class="cx"> #include "AuthenticationManager.h"
</span><span class="cx"> #include "AuxiliaryProcessMessages.h"
</span><span class="lines">@@ -1694,7 +1693,6 @@
</span><span class="cx">             case API::Object::Type::PageHandle:
</span><span class="cx">                 return static_cast<const API::PageHandle&>(object).isAutoconverting();
</span><span class="cx"> 
</span><del>-            case API::Object::Type::PageGroupHandle:
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">             case API::Object::Type::ObjCObjectGraph:
</span><span class="cx"> #endif
</span><span class="lines">@@ -1711,9 +1709,6 @@
</span><span class="cx">             case API::Object::Type::FrameHandle:
</span><span class="cx">                 return m_webProcess.webFrame(static_cast<const API::FrameHandle&>(object).frameID());
</span><span class="cx"> 
</span><del>-            case API::Object::Type::PageGroupHandle:
-                return m_webProcess.webPageGroup(static_cast<const API::PageGroupHandle&>(object).webPageGroupData());
-
</del><span class="cx">             case API::Object::Type::PageHandle:
</span><span class="cx">                 return m_webProcess.webPage(static_cast<const API::PageHandle&>(object).webPageID());
</span><span class="cx"> 
</span><span class="lines">@@ -1740,7 +1735,6 @@
</span><span class="cx">             switch (object.type()) {
</span><span class="cx">             case API::Object::Type::BundleFrame:
</span><span class="cx">             case API::Object::Type::BundlePage:
</span><del>-            case API::Object::Type::BundlePageGroup:
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">             case API::Object::Type::ObjCObjectGraph:
</span><span class="cx"> #endif
</span><span class="lines">@@ -1760,13 +1754,6 @@
</span><span class="cx">             case API::Object::Type::BundlePage:
</span><span class="cx">                 return API::PageHandle::createAutoconverting(static_cast<const WebPage&>(object).webPageProxyIdentifier(), static_cast<const WebPage&>(object).identifier());
</span><span class="cx"> 
</span><del>-            case API::Object::Type::BundlePageGroup: {
-                WebPageGroupData pageGroupData;
-                pageGroupData.pageGroupID = static_cast<const WebPageGroupProxy&>(object).pageGroupID();
-
-                return API::PageGroupHandle::create(WTFMove(pageGroupData));
-            }
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">             case API::Object::Type::ObjCObjectGraph:
</span><span class="cx">                 return transformObjectsToHandles(static_cast<ObjCObjectGraph&>(object));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Tools/ChangeLog       2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-05-17  Alex Christensen  <achristensen@webkit.org>
+
+        Remove API::Object::Type::BundlePageGroup
+        https://bugs.webkit.org/show_bug.cgi?id=225611
+
+        Reviewed by Brady Eidson.
+
+        Some tests were trying to encode a page group, but it was unused so I just removed them.
+
+        * TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit/InjectedBundleDisableOverrideBuiltinsBehavior.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit/InjectedBundleMakeAllShadowRootsOpen.cpp:
+        (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2021-05-17  Aakash Jain  <aakash_jain@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Style checker should check for non-inclusive terminology
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitDOMWindowExtensionBasiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp       2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp  2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> {
</span><span class="cx">     WKRetainPtr<WKPageGroupRef> pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DOMWindowExtensionBasicPageGroup")));
</span><span class="cx"> 
</span><del>-    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DOMWindowExtensionBasic", pageGroup.get()));
</del><ins>+    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DOMWindowExtensionBasic"));
</ins><span class="cx"> 
</span><span class="cx">     WKContextInjectedBundleClientV0 injectedBundleClient;
</span><span class="cx">     memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitDocumentStartUserScriptAlertCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp     2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp        2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> {
</span><span class="cx">     WKRetainPtr<WKPageGroupRef> pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DocumentStartUserScriptAlertCrashTestPageGroup"))); 
</span><span class="cx"> 
</span><del>-    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DocumentStartUserScriptAlertCrashTest", pageGroup.get()));
</del><ins>+    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DocumentStartUserScriptAlertCrashTest"));
</ins><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><span class="cx">     WKPageUIClientV0 uiClient;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitInjectedBundleDisableOverrideBuiltinsBehaviorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleDisableOverrideBuiltinsBehavior.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleDisableOverrideBuiltinsBehavior.cpp 2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleDisableOverrideBuiltinsBehavior.cpp    2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> {
</span><span class="cx">     WKRetainPtr<WKPageGroupRef> pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("InjectedBundleNoDisableOverrideBuiltinsBehaviorTestPageGroup")));
</span><span class="cx"> 
</span><del>-    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("InjectedBundleNoDisableOverrideBuiltinsBehaviorTest", pageGroup.get()));
</del><ins>+    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("InjectedBundleNoDisableOverrideBuiltinsBehaviorTest"));
</ins><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><span class="cx">     WKPageUIClientV0 uiClient;
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> {
</span><span class="cx">     WKRetainPtr<WKPageGroupRef> pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("InjectedBundleDisableOverrideBuiltinsBehaviorTestPageGroup")));
</span><span class="cx"> 
</span><del>-    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("InjectedBundleDisableOverrideBuiltinsBehaviorTest", pageGroup.get()));
</del><ins>+    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("InjectedBundleDisableOverrideBuiltinsBehaviorTest"));
</ins><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><span class="cx">     WKPageUIClientV0 uiClient;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitInjectedBundleMakeAllShadowRootsOpencpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleMakeAllShadowRootsOpen.cpp (277613 => 277614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleMakeAllShadowRootsOpen.cpp  2021-05-17 23:20:16 UTC (rev 277613)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleMakeAllShadowRootsOpen.cpp     2021-05-17 23:24:23 UTC (rev 277614)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> {
</span><span class="cx">     WKRetainPtr<WKPageGroupRef> pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("InjectedBundleMakeAllShadowRootOpenTestPageGroup")));
</span><span class="cx"> 
</span><del>-    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("InjectedBundleMakeAllShadowRootOpenTest", pageGroup.get()));
</del><ins>+    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("InjectedBundleMakeAllShadowRootOpenTest"));
</ins><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><span class="cx">     WKPageUIClientV0 uiClient;
</span></span></pre>
</div>
</div>

</body>
</html>