Skip to content

Commit

Permalink
Remove WKBrowsingContextGroup
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=259293
rdar://112428925

Reviewed by Tim Horton.

Its last use was removed in rdar://110011076

* Source/WebKit/Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
* Source/WebKit/SourcesCocoa.txt:
* Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm:
* Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.h:
* Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm: Removed.
* Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroupInternal.h: Removed.
* Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroupPrivate.h:
* Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm:
* Source/WebKit/UIProcess/API/Cocoa/WKView.h:
* Source/WebKit/UIProcess/API/Cocoa/_WKDownload.mm:
* Source/WebKit/UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:processGroup:browsingContextGroup:]): Deleted.
(-[WKView initWithFrame:processGroup:browsingContextGroup:relatedToView:]): Deleted.
* Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteScrollingTreeMac.mm:
* Source/WebKit/UIProcess/ios/WKContentView.h:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/Tests/WebKitObjC/UserContentTest.mm:
* Tools/TestWebKitAPI/Tests/WebKitObjC/WKBrowsingContextGroupTest.mm: Removed.
* Tools/TestWebKitAPI/Tests/WebKitObjC/WKBrowsingContextLoadDelegateTest.mm:

Canonical link: https://commits.webkit.org/266143@main
  • Loading branch information
achristensen07 committed Jul 18, 2023
1 parent 190a527 commit 5065b21
Show file tree
Hide file tree
Showing 20 changed files with 8 additions and 367 deletions.
7 changes: 0 additions & 7 deletions Source/WebKit/Shared/Cocoa/APIObject.mm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#import "WKBackForwardListInternal.h"
#import "WKBackForwardListItemInternal.h"
#import "WKBrowsingContextControllerInternal.h"
#import "WKBrowsingContextGroupInternal.h"
#import "WKConnectionInternal.h"
#import "WKContentRuleListInternal.h"
#import "WKContentRuleListStoreInternal.h"
Expand Down Expand Up @@ -311,12 +310,6 @@
break;
#endif

case Type::PageGroup:
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
wrapper = [WKBrowsingContextGroup alloc];
ALLOW_DEPRECATED_DECLARATIONS_END
break;

case Type::SecurityOrigin:
wrapper = [WKSecurityOrigin alloc];
break;
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/SourcesCocoa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ UIProcess/API/Cocoa/NSAttributedString.mm
UIProcess/API/Cocoa/WKBackForwardList.mm
UIProcess/API/Cocoa/WKBackForwardListItem.mm
UIProcess/API/Cocoa/WKBrowsingContextController.mm
UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
UIProcess/API/Cocoa/WKConnection.mm
UIProcess/API/Cocoa/WKContentRuleList.mm
UIProcess/API/Cocoa/WKContentRuleListStore.mm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#import "WKAPICast.h"
#import "WKBackForwardListInternal.h"
#import "WKBackForwardListItemInternal.h"
#import "WKBrowsingContextGroupInternal.h"
#import "WKBrowsingContextHandleInternal.h"
#import "WKBrowsingContextLoadDelegatePrivate.h"
#import "WKBrowsingContextPolicyDelegate.h"
Expand Down
34 changes: 1 addition & 33 deletions Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,36 +28,4 @@
#import <Foundation/Foundation.h>
#import <WebKit/WKUserScriptInjectionTime.h>

WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKUserContentController and WKPreferences", macos(10.10, 10.14.4), ios(8.0, 12.2))
@interface WKBrowsingContextGroup : NSObject

- (id)initWithIdentifier:(NSString *)identifier;

/* User Content */

- (void)addUserStyleSheet:(NSString *)source baseURL:(NSURL *)baseURL includeMatchPatternStrings:(NSArray<NSString *> *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray<NSString *> *)excludeMatchPatternStrings mainFrameOnly:(BOOL)mainFrameOnly;

- (void)removeAllUserStyleSheets;

- (void)addUserScript:(NSString *)source baseURL:(NSURL *)baseURL includeMatchPatternStrings:(NSArray<NSString *> *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray<NSString *> *)excludeMatchPatternStrings injectionTime:(_WKUserScriptInjectionTime)injectionTime mainFrameOnly:(BOOL)mainFrameOnly;
- (void)removeAllUserScripts;


/* Settings */

/* Setting to control whether JavaScript is enabled.
Default: YES
*/
@property BOOL allowsJavaScript;

/* Setting to control whether plug-ins are enabled.
Default: YES
*/
@property BOOL allowsPlugIns;

/* Setting to control whether private browsing is enabled.
Default: NO
*/
@property BOOL privateBrowsingEnabled;

@end
// FIXME: Remove this header once rdar://112426343 is resolved.
193 changes: 0 additions & 193 deletions Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm

This file was deleted.

42 changes: 0 additions & 42 deletions Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroupInternal.h

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,4 @@

#import <WebKit/WKBase.h>

@interface WKBrowsingContextGroup (Private)

@property(readonly) WKPageGroupRef _pageGroupRef;

@end
// FIXME: Remove this header once rdar://112426343 is resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#import "WKScriptMessageInternal.h"
#import "WKUserScriptInternal.h"
#import "WKWebViewInternal.h"
#import "WebPageProxy.h"
#import "WebScriptMessageHandler.h"
#import "WebUserContentControllerProxy.h"
#import "_WKUserContentFilterInternal.h"
Expand Down
4 changes: 0 additions & 4 deletions Source/WebKit/UIProcess/API/Cocoa/WKView.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#endif

@class WKBrowsingContextController;
@class WKBrowsingContextGroup;
@class WKProcessGroup;
@class WKViewData;

Expand All @@ -50,9 +49,6 @@ WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKWebView", macos(10.10, 10.14.4), ios(8.0
WK_UNUSED_INSTANCE_VARIABLE unsigned _unused;
}

- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
@property(readonly) WKBrowsingContextController *browsingContextController;
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/UIProcess/API/Cocoa/_WKDownload.mm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#import "WKFrameInfoInternal.h"
#import "WKNSData.h"
#import "WKWebViewInternal.h"
#import "WebPageProxy.h"
#import <wtf/WeakObjCPtr.h>
#import <wtf/cocoa/VectorCocoa.h>

Expand Down
10 changes: 0 additions & 10 deletions Source/WebKit/UIProcess/API/mac/WKView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@ @interface WKView () <NSFilePromiseProviderDelegate, NSDraggingSource>
@implementation WKView
ALLOW_DEPRECATED_IMPLEMENTATIONS_END

- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup
{
return nil;
}

- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView
{
return nil;
}

- (void)dealloc
{
[super dealloc];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#if HAVE(APP_SSO)

#import "Logging.h"
#import "PageLoadState.h"
#import "WebPageProxy.h"
#import <WebCore/ResourceResponse.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@
#import "ScrollingTreeFrameScrollingNodeRemoteMac.h"
#import "ScrollingTreeOverflowScrollingNodeRemoteMac.h"
#import <WebCore/FrameView.h>
#import <WebCore/LocalFrameView.h>
#import <WebCore/ScrollingThread.h>
#import <WebCore/ScrollingTreeFixedNodeCocoa.h>
#import <WebCore/ScrollingTreeOverflowScrollProxyNode.h>
#import <WebCore/ScrollingTreePositionedNode.h>
#import <WebCore/WebCoreCALayerExtras.h>
#import <pal/spi/cocoa/QuartzCoreSPI.h>
#import <wtf/text/TextStream.h>

namespace WebKit {
Expand Down
Loading

0 comments on commit 5065b21

Please sign in to comment.