⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 277672 in webkit


Ignore:
Timestamp:
May 18, 2021, 1:26:15 PM (5 years ago)
Author:
achristensen@apple.com
Message:

Unreviewed, reverting r277614.
<rdar://78167889>

Broke Mail

Reverted changeset:

"Remove API::Object::Type::BundlePageGroup"
​https://bugs.webkit.org/show_bug.cgi?id=225611
​https://commits.webkit.org/r277614

Location:
trunk/Source/WebKit
Files:
15 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r277666 r277672  
     12021-05-18  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, reverting r277614.
     4        <rdar://78167889>
     5
     6        Broke Mail
     7
     8        Reverted changeset:
     9
     10        "Remove API::Object::Type::BundlePageGroup"
     11        https://bugs.webkit.org/show_bug.cgi?id=225611
     12        https://commits.webkit.org/r277614
     13
    1142021-05-18  Said Abou-Hallawa  <said@apple.com>
    215

  • trunk/Source/WebKit/Shared/API/APIObject.h

    r277614 r277672  
    6767        FrameHandle,
    6868        Image,
     69        PageGroupData,
    6970        PageHandle,
     71        PageGroupHandle,
    7072        ProtectionSpace,
    7173        RenderLayer,
    … …  
    203205        BundlePage,
    204206        BundlePageBanner,
     207        BundlePageGroup,
    205208        BundlePageOverlay,
    206209        BundleRangeHandle,
    … …  
    317320        API::Object::Type::FrameHandle,
    318321        API::Object::Type::Image,
     322        API::Object::Type::PageGroupData,
    319323        API::Object::Type::PageHandle,
     324        API::Object::Type::PageGroupHandle,
    320325        API::Object::Type::ProtectionSpace,
    321326        API::Object::Type::ResourceLoadInfo,
    … …  
    451456        API::Object::Type::BundlePage,
    452457        API::Object::Type::BundlePageBanner,
     458        API::Object::Type::BundlePageGroup,
    453459        API::Object::Type::BundlePageOverlay,
    454460        API::Object::Type::BundleRangeHandle,

  • trunk/Source/WebKit/Shared/Cocoa/APIObject.mm

    r277614 r277672  
    6464#import "WKWebProcessPlugInInternal.h"
    6565#import "WKWebProcessPlugInNodeHandleInternal.h"
     66#import "WKWebProcessPlugInPageGroupInternal.h"
    6667#import "WKWebProcessPlugInRangeHandleInternal.h"
    6768#import "WKWebProcessPlugInScriptWorldInternal.h"
    … …  
    427428        break;
    428429
     430    case Type::BundlePageGroup:
     431        ALLOW_DEPRECATED_DECLARATIONS_BEGIN;
     432        wrapper = [WKWebProcessPlugInPageGroup alloc];
     433        ALLOW_DEPRECATED_DECLARATIONS_END;
     434        break;
     435
    429436    case Type::BundleRangeHandle:
    430437        wrapper = [WKWebProcessPlugInRangeHandle alloc];

  • trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.cpp

    r277655 r277672  
    8181}
    8282
    83 void SharedRingBufferStorage::setStorage(RefPtr<SharedMemory>&& storage, const WebCore::CAAudioStreamDescription& format, size_t frameCount)
     83void SharedRingBufferStorage::setStorage(RefPtr<SharedMemory>&& storage, const CAAudioStreamDescription& format, size_t frameCount)
    8484{
    8585    m_storage = WTFMove(storage);
    … …  
    8888}
    8989
    90 void SharedRingBufferStorage::allocate(size_t byteCount, const WebCore::CAAudioStreamDescription& format, size_t frameCount)
     90void SharedRingBufferStorage::allocate(size_t byteCount, const CAAudioStreamDescription& format, size_t frameCount)
    9191{
    9292    auto sharedMemory = SharedMemory::allocate(byteCount + sizeof(FrameBounds));

  • trunk/Source/WebKit/Shared/UserData.cpp

    r277614 r277672  
    3434#include "APIGeometry.h"
    3535#include "APINumber.h"
     36#include "APIPageGroupHandle.h"
    3637#include "APIPageHandle.h"
    3738#include "APISerializedScriptValue.h"
    … …  
    230231    }
    231232
     233    case API::Object::Type::PageGroupHandle:
     234        static_cast<const API::PageGroupHandle&>(object).encode(encoder);
     235        break;
     236
    232237    case API::Object::Type::PageHandle:
    233238        static_cast<const API::PageHandle&>(object).encode(encoder);
    … …  
    411416        break;
    412417
     418    case API::Object::Type::PageGroupHandle:
     419        if (!API::PageGroupHandle::decode(decoder, result))
     420            return false;
     421        break;
     422
    413423    case API::Object::Type::PageHandle:
    414424        if (!API::PageHandle::decode(decoder, result))

  • trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h

    r277614 r277672  
    3030#include "CoreMediaWrapped.h"
    3131#include <WebCore/SampleMap.h>
    32 #include <wtf/Identified.h>
    3332#include <wtf/MediaTime.h>
    3433#include <wtf/Variant.h>

  • trunk/Source/WebKit/Sources.txt

    r277614 r277672  
    239239Shared/API/APIGeometry.cpp
    240240Shared/API/APIObject.cpp
     241Shared/API/APIPageGroupHandle.cpp
    241242Shared/API/APIPageHandle.cpp
    242243Shared/API/APIURLRequest.cpp

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

    r277614 r277672  
    2828
    2929#include "APIFrameHandle.h"
     30#include "APIPageGroupHandle.h"
    3031#include "APIPageHandle.h"
    3132#include "AuthenticatorManager.h"
    … …  
    13401341                return static_cast<const API::PageHandle&>(object).isAutoconverting();
    13411342
     1343            case API::Object::Type::PageGroupHandle:
    13421344#if PLATFORM(COCOA)
    13431345            case API::Object::Type::ObjCObjectGraph:
    … …  
    13561358                ASSERT(static_cast<API::FrameHandle&>(object).isAutoconverting());
    13571359                return m_webProcessProxy.webFrame(static_cast<API::FrameHandle&>(object).frameID());
     1360
     1361            case API::Object::Type::PageGroupHandle:
     1362                return WebPageGroup::get(static_cast<API::PageGroupHandle&>(object).webPageGroupData().pageGroupID);
    13581363
    13591364            case API::Object::Type::PageHandle:
    … …  
    14031408            case API::Object::Type::Page:
    14041409                return API::PageHandle::createAutoconverting(static_cast<const WebPageProxy&>(object).identifier(), static_cast<const WebPageProxy&>(object).webPageID());
     1410
     1411            case API::Object::Type::PageGroup:
     1412                return API::PageGroupHandle::create(WebPageGroupData(static_cast<const WebPageGroup&>(object).data()));
    14051413
    14061414#if PLATFORM(COCOA)

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r277627 r277672  
    465465                1F7D36C118DA513F00D9D659 /* APIDownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */; };
    466466                1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
     467                1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */; };
    467468                263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 263172CE18B469490065B9C3 /* NativeWebTouchEvent.h */; };
    468469                2684054418B85A630022C38B /* VisibleContentRectUpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2684054218B85A630022C38B /* VisibleContentRectUpdateInfo.h */; };
    … …  
    26592660                1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageAreaMapMessageReceiver.cpp; path = DerivedSources/WebKit2/StorageAreaMapMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    26602661                1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageAreaMapMessages.h; path = DerivedSources/WebKit2/StorageAreaMapMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
     2662                1A3A73CB1A48C6D4007231B3 /* APIPageGroupHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIPageGroupHandle.cpp; sourceTree = "<group>"; };
     2663                1A3A73CC1A48C6D4007231B3 /* APIPageGroupHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIPageGroupHandle.h; sourceTree = "<group>"; };
    26612664                1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesInternal.h; sourceTree = "<group>"; };
    26622665                1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; };
    … …  
    31133116                1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroup.h; sourceTree = "<group>"; };
    31143117                1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInPageGroup.mm; sourceTree = "<group>"; };
     3118                1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroupInternal.h; sourceTree = "<group>"; };
    31153119                263172CE18B469490065B9C3 /* NativeWebTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebTouchEvent.h; sourceTree = "<group>"; };
    31163120                26659AA0185FAAED004303DD /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
    … …  
    72307234                                1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */,
    72317235                                1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */,
     7236                                1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */,
    72327237                                374942191DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.h */,
    72337238                                374942181DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.mm */,
    … …  
    1088010885                                B63403F814910D57001070B5 /* APIObject.cpp */,
    1088110886                                BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
     10887                                1A3A73CB1A48C6D4007231B3 /* APIPageGroupHandle.cpp */,
     10888                                1A3A73CC1A48C6D4007231B3 /* APIPageGroupHandle.h */,
    1088210889                                1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */,
    1088310890                                1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */,
    … …  
    1298012987                                CEC8F9CB1FDF5870002635E7 /* WKWebProcessPlugInNodeHandlePrivate.h in Headers */,
    1298112988                                1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */,
     12989                                1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */,
    1298212990                                BC04EFFC16E65AFB00E336F0 /* WKWebProcessPlugInPrivate.h in Headers */,
    1298312991                                3749421B1DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.h in Headers */,

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h

    r277614 r277672  
    2828#import <Foundation/Foundation.h>
    2929
    30 // FIXME: Remove this file once the staging code for rdar://77775952 is removed.
    3130WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKWebProcessPlugInBrowserContextController._groupIdentifier", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    3231@interface WKWebProcessPlugInPageGroup : NSObject
    3332
     33@property (readonly) NSString *identifier;
     34
    3435@end

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm

    r277614 r277672  
    2525
    2626#import "config.h"
    27 #import "WKWebProcessPlugInPageGroup.h"
     27#import "WKWebProcessPlugInPageGroupInternal.h"
    2828
    29 // FIXME: Remove this file once the staging code for rdar://77775952 is removed.
     29#import "WKAPICast.h"
     30#import "WKNSString.h"
     31#import "WKRetainPtr.h"
     32#import "WebPageGroupProxy.h"
     33#import <WebCore/WebCoreObjCExtras.h>
    3034
    3135ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
    32 @implementation WKWebProcessPlugInPageGroup
     36@implementation WKWebProcessPlugInPageGroup {
     37    API::ObjectStorage<WebKit::WebPageGroupProxy> _bundlePageGroup;
     38}
    3339ALLOW_DEPRECATED_IMPLEMENTATIONS_END
    3440
     41- (NSString *)identifier
     42{
     43    return _bundlePageGroup->identifier();
     44}
     45
     46- (void)dealloc
     47{
     48    if (WebCoreObjCScheduleDeallocateOnMainRunLoop(WKWebProcessPlugInPageGroup.class, self))
     49        return;
     50    _bundlePageGroup->~WebPageGroupProxy();
     51    [super dealloc];
     52}
     53
     54#pragma mark WKObject protocol implementation
     55
     56- (API::Object&)_apiObject
     57{
     58    return *_bundlePageGroup;
     59}
     60
    3561@end

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h

    r277614 r277672  
    3131@class WKDOMRange;
    3232@class WKWebProcessPlugInFrame;
     33@class WKWebProcessPlugInPageGroup;
    3334@protocol WKWebProcessPlugInLoadDelegate;
    3435
    … …  
    4243@property (readonly) WKWebProcessPlugInFrame *mainFrame;
    4344
     45@property (readonly) WKWebProcessPlugInPageGroup *pageGroup WK_API_DEPRECATED_WITH_REPLACEMENT("_groupIdentifier", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
     46
    4447@property (weak) id <WKWebProcessPlugInLoadDelegate> loadDelegate;
    4548

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm

    r277614 r277672  
    4949#import "WKWebProcessPlugInLoadDelegate.h"
    5050#import "WKWebProcessPlugInNodeHandleInternal.h"
     51#import "WKWebProcessPlugInPageGroupInternal.h"
    5152#import "WKWebProcessPlugInRangeHandleInternal.h"
    5253#import "WKWebProcessPlugInScriptWorldInternal.h"
    5354#import "WebPage.h"
    54 #import "WebPageGroupProxy.h"
    5555#import "WebProcess.h"
    5656#import "_WKRemoteObjectRegistryInternal.h"
    … …  
    405405}
    406406
     407- (WKWebProcessPlugInPageGroup *)pageGroup
     408{
     409    return wrapper(*_page->pageGroup());
     410}
     411
    407412#pragma mark WKObject protocol implementation
    408413

  • trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h

    r277614 r277672  
    3939class WebUserContentController;
    4040
    41 class WebPageGroupProxy : public RefCounted<WebPageGroupProxy> {
     41class WebPageGroupProxy : public API::ObjectImpl<API::Object::Type::BundlePageGroup> {
    4242public:
    4343    static Ref<WebPageGroupProxy> create(const WebPageGroupData&);

  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r277641 r277672  
    2828
    2929#include "APIFrameHandle.h"
     30#include "APIPageGroupHandle.h"
    3031#include "APIPageHandle.h"
    3132#include "AuthenticationManager.h"
    … …  
    16981699                return static_cast<const API::PageHandle&>(object).isAutoconverting();
    16991700
     1701            case API::Object::Type::PageGroupHandle:
    17001702#if PLATFORM(COCOA)
    17011703            case API::Object::Type::ObjCObjectGraph:
    … …  
    17131715            case API::Object::Type::FrameHandle:
    17141716                return m_webProcess.webFrame(static_cast<const API::FrameHandle&>(object).frameID());
     1717
     1718            case API::Object::Type::PageGroupHandle:
     1719                return m_webProcess.webPageGroup(static_cast<const API::PageGroupHandle&>(object).webPageGroupData());
    17151720
    17161721            case API::Object::Type::PageHandle:
    … …  
    17401745            case API::Object::Type::BundleFrame:
    17411746            case API::Object::Type::BundlePage:
     1747            case API::Object::Type::BundlePageGroup:
    17421748#if PLATFORM(COCOA)
    17431749            case API::Object::Type::ObjCObjectGraph:
    … …  
    17581764            case API::Object::Type::BundlePage:
    17591765                return API::PageHandle::createAutoconverting(static_cast<const WebPage&>(object).webPageProxyIdentifier(), static_cast<const WebPage&>(object).identifier());
     1766
     1767            case API::Object::Type::BundlePageGroup: {
     1768                WebPageGroupData pageGroupData;
     1769                pageGroupData.pageGroupID = static_cast<const WebPageGroupProxy&>(object).pageGroupID();
     1770
     1771                return API::PageGroupHandle::create(WTFMove(pageGroupData));
     1772            }
    17601773
    17611774#if PLATFORM(COCOA)
Note: See TracChangeset for help on using the changeset viewer.