Skip to content
Permalink
Browse files
Remove deprecated WebKit symbols
https://bugs.webkit.org/show_bug.cgi?id=178875
rdar://problem/31139070

Reviewed by Dan Bernstein.

* PlatformMac.cmake:
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKContextSetProcessModel):
(WKPageGroupCopyIdentifier): Deleted.
(WKPageGroupAddUserContentFilter): Deleted.
(WKPageGroupRemoveUserContentFilter): Deleted.
* UIProcess/API/C/WKPageGroup.h:
* UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm: Removed.
* UIProcess/API/Cocoa/_WKVisitedLinkStore.h:
* WebKit.xcodeproj/project.pbxproj:


Canonical link: https://commits.webkit.org/195027@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224035 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aproskuryakov committed Oct 26, 2017
1 parent 5c40966 commit bf7a1d43b9a0b277c1114aa0cf2f1047a8c15643
Showing 7 changed files with 19 additions and 76 deletions.
@@ -1,3 +1,22 @@
2017-10-26 Alexey Proskuryakov <ap@apple.com>

Remove deprecated WebKit symbols
https://bugs.webkit.org/show_bug.cgi?id=178875
rdar://problem/31139070

Reviewed by Dan Bernstein.

* PlatformMac.cmake:
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKContextSetProcessModel):
(WKPageGroupCopyIdentifier): Deleted.
(WKPageGroupAddUserContentFilter): Deleted.
(WKPageGroupRemoveUserContentFilter): Deleted.
* UIProcess/API/C/WKPageGroup.h:
* UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm: Removed.
* UIProcess/API/Cocoa/_WKVisitedLinkStore.h:
* WebKit.xcodeproj/project.pbxproj:

2017-10-26 Ryan Haddad <ryanhaddad@apple.com>

Unreviewed, rolling out r223984.
@@ -239,7 +239,6 @@ list(APPEND WebKit_SOURCES
UIProcess/API/Cocoa/_WKUserContentWorld.mm
UIProcess/API/Cocoa/_WKUserInitiatedAction.mm
UIProcess/API/Cocoa/_WKUserStyleSheet.mm
UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm
UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
UIProcess/API/Cocoa/_WKWebsiteDataSize.mm
UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
@@ -51,28 +51,3 @@ void WKContextSetUsesNetworkProcess(WKContextRef, bool)
void WKContextSetProcessModel(WKContextRef, WKProcessModel)
{
}

WKStringRef WKPageGroupCopyIdentifier(WKPageGroupRef)
{
return nullptr;
}

void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroupRef, WKUserContentFilterRef contentFilterRef)
{
#if ENABLE(CONTENT_EXTENSIONS)
toImpl(pageGroupRef)->userContentController().addContentRuleList(*toImpl(contentFilterRef));
#else
UNUSED_PARAM(pageGroupRef);
UNUSED_PARAM(contentFilterRef);
#endif
}

void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroupRef, WKStringRef contentFilterNameRef)
{
#if ENABLE(CONTENT_EXTENSIONS)
toImpl(pageGroupRef)->userContentController().removeContentRuleList(toWTFString(contentFilterNameRef));
#else
UNUSED_PARAM(pageGroupRef);
UNUSED_PARAM(contentFilterNameRef);
#endif
}
@@ -49,13 +49,6 @@ WK_EXPORT void WKPageGroupRemoveAllUserStyleSheets(WKPageGroupRef pageGroup);
WK_EXPORT void WKPageGroupAddUserScript(WKPageGroupRef pageGroup, WKStringRef source, WKURLRef baseURL, WKArrayRef whitelistedURLPatterns, WKArrayRef blacklistedURLPatterns, WKUserContentInjectedFrames, _WKUserScriptInjectionTime);
WK_EXPORT void WKPageGroupRemoveAllUserScripts(WKPageGroupRef pageGroup);


// -- DEPRECATED --

WK_EXPORT WKStringRef WKPageGroupCopyIdentifier(WKPageGroupRef pageGroup) WK_UNAVAILABLE;
WK_EXPORT void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroup, WKUserContentFilterRef userContentFilter) WK_UNAVAILABLE;
WK_EXPORT void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroup, WKStringRef userContentFilterName) WK_UNAVAILABLE;

#ifdef __cplusplus
}
#endif

This file was deleted.

@@ -38,9 +38,4 @@ WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))

@end

// Defined for binary compatibility with Safari in iOS 10.
__attribute__((visibility("default"))) NS_UNAVAILABLE
@interface _WKVisitedLinkProvider : _WKVisitedLinkStore
@end

#endif
@@ -173,7 +173,6 @@
1A1EF1991A1D5B420023200A /* APIDataCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1EF1971A1D5B420023200A /* APIDataCocoa.mm */; };
1A1FEC1C1627B45700700F6D /* WebConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */; };
1A1FEC1D1627B45700700F6D /* WebConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */; };
1A2067921B8B906600C13C36 /* _WKVisitedLinkProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2067901B8B906600C13C36 /* _WKVisitedLinkProvider.mm */; };
1A2161B011F37664008AD0F5 /* NPRuntimeObjectMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */; };
1A2161B111F37664008AD0F5 /* NPRuntimeObjectMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */; };
1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */; };
@@ -2417,7 +2416,6 @@
1A1FEC191627B3EF00700F6D /* WebConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebConnection.messages.in; sourceTree = "<group>"; };
1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebConnectionMessages.h; sourceTree = "<group>"; };
1A2067901B8B906600C13C36 /* _WKVisitedLinkProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkProvider.mm; sourceTree = "<group>"; };
1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRuntimeObjectMap.h; sourceTree = "<group>"; };
1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeObjectMap.cpp; sourceTree = "<group>"; };
1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeUtilities.cpp; sourceTree = "<group>"; };
@@ -4763,7 +4761,6 @@
1A43E826188F38E2009E4D30 /* Deprecated */ = {
isa = PBXGroup;
children = (
1A2067901B8B906600C13C36 /* _WKVisitedLinkProvider.mm */,
1AFB4C701ADF155D00B33339 /* _WKWebsiteDataStore.h */,
1AFB4C6F1ADF155D00B33339 /* _WKWebsiteDataStore.mm */,
1A4A93B61AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h */,
@@ -10059,7 +10056,6 @@
7C882DF81C7E996C006BF731 /* _WKUserContentWorld.mm in Sources */,
7CB365AB1D31DB70007158CA /* _WKUserInitiatedAction.mm in Sources */,
2D87861E1BDB54BF00D02ABB /* _WKUserStyleSheet.mm in Sources */,
1A2067921B8B906600C13C36 /* _WKVisitedLinkProvider.mm in Sources */,
1A81B38018BD66AD0007FDAC /* _WKVisitedLinkStore.mm in Sources */,
1AE286771C7E76510069AC4F /* _WKWebsiteDataSize.mm in Sources */,
1AFB4C711ADF155D00B33339 /* _WKWebsiteDataStore.mm in Sources */,

0 comments on commit bf7a1d4

Please sign in to comment.