Diff
Modified: trunk/Source/WebKit/ChangeLog (224034 => 224035)
--- trunk/Source/WebKit/ChangeLog 2017-10-26 18:51:33 UTC (rev 224034)
+++ trunk/Source/WebKit/ChangeLog 2017-10-26 18:54:46 UTC (rev 224035)
@@ -1,3 +1,22 @@
+2017-10-26 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r223984.
Modified: trunk/Source/WebKit/PlatformMac.cmake (224034 => 224035)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-10-26 18:51:33 UTC (rev 224034)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-10-26 18:54:46 UTC (rev 224035)
@@ -239,7 +239,6 @@
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
Modified: trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp (224034 => 224035)
--- trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp 2017-10-26 18:51:33 UTC (rev 224034)
+++ trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp 2017-10-26 18:54:46 UTC (rev 224035)
@@ -51,28 +51,3 @@
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
-}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPageGroup.h (224034 => 224035)
--- trunk/Source/WebKit/UIProcess/API/C/WKPageGroup.h 2017-10-26 18:51:33 UTC (rev 224034)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPageGroup.h 2017-10-26 18:54:46 UTC (rev 224035)
@@ -49,13 +49,6 @@
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
Deleted: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm (224034 => 224035)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm 2017-10-26 18:51:33 UTC (rev 224034)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm 2017-10-26 18:54:46 UTC (rev 224035)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 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 "_WKVisitedLinkStore.h"
-
-#if WK_API_ENABLED
-
-@implementation _WKVisitedLinkProvider
-@end
-
-#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKVisitedLinkStore.h (224034 => 224035)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKVisitedLinkStore.h 2017-10-26 18:51:33 UTC (rev 224034)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKVisitedLinkStore.h 2017-10-26 18:54:46 UTC (rev 224035)
@@ -38,9 +38,4 @@
@end
-// Defined for binary compatibility with Safari in iOS 10.
-__attribute__((visibility("default"))) NS_UNAVAILABLE
-@interface _WKVisitedLinkProvider : _WKVisitedLinkStore
-@end
-
#endif
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (224034 => 224035)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-10-26 18:51:33 UTC (rev 224034)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-10-26 18:54:46 UTC (rev 224035)
@@ -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 */,
