Title: [213198] trunk/Source/WebKit2
- Revision
- 213198
- Author
- a...@apple.com
- Date
- 2017-02-28 17:17:18 -0800 (Tue, 28 Feb 2017)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=168899
Re-add deprecated functions to WKPageGroup.h
Reviewed by Tim Horton.
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKPageGroupRemoveUserContentFilter):
(WKPageGroupRemoveAllUserContentFilters): Deleted. Unlike the other three, this
function isn't used by any clients.
* UIProcess/API/C/WKPageGroup.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (213197 => 213198)
--- trunk/Source/WebKit2/ChangeLog 2017-03-01 01:10:40 UTC (rev 213197)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-01 01:17:18 UTC (rev 213198)
@@ -1,5 +1,18 @@
2017-02-28 Alexey Proskuryakov <a...@apple.com>
+ https://bugs.webkit.org/show_bug.cgi?id=168899
+ Re-add deprecated functions to WKPageGroup.h
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKPageGroupRemoveUserContentFilter):
+ (WKPageGroupRemoveAllUserContentFilters): Deleted. Unlike the other three, this
+ function isn't used by any clients.
+ * UIProcess/API/C/WKPageGroup.h:
+
+2017-02-28 Alexey Proskuryakov <a...@apple.com>
+
Expose _WKVisitedLinkProvider in a header
https://bugs.webkit.org/show_bug.cgi?id=168955
Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (213197 => 213198)
--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2017-03-01 01:10:40 UTC (rev 213197)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2017-03-01 01:17:18 UTC (rev 213198)
@@ -27,10 +27,10 @@
#include "APIDictionary.h"
#include "APIUserContentExtension.h"
-#include "WKAPICast.h"
#include "WKArray.h"
#include "WKContextPrivate.h"
#include "WKMutableDictionary.h"
+#include "WKPageGroup.h"
#include "WKPreferencesRefPrivate.h"
#include "WebPageGroup.h"
#include "WebUserContentControllerProxy.h"
@@ -41,13 +41,6 @@
// Deprecated functions that should be removed from the framework once nobody uses them.
-extern "C" {
-WK_EXPORT WKStringRef WKPageGroupCopyIdentifier(WKPageGroupRef pageGroup);
-WK_EXPORT void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroup, WKUserContentFilterRef userContentFilter);
-WK_EXPORT void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroup, WKStringRef userContentFilterName);
-WK_EXPORT void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroup);
-}
-
using namespace WebKit;
void WKContextSetUsesNetworkProcess(WKContextRef, bool)
@@ -82,12 +75,3 @@
UNUSED_PARAM(userContentFilterNameRef);
#endif
}
-
-void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroupRef)
-{
-#if ENABLE(CONTENT_EXTENSIONS)
- toImpl(pageGroupRef)->userContentController().removeAllUserContentExtensions();
-#else
- UNUSED_PARAM(pageGroupRef);
-#endif
-}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h (213197 => 213198)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2017-03-01 01:10:40 UTC (rev 213197)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2017-03-01 01:17:18 UTC (rev 213198)
@@ -49,6 +49,13 @@
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) __attribute__((unavailable));
+WK_EXPORT void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroup, WKUserContentFilterRef userContentFilter) __attribute__((unavailable));
+WK_EXPORT void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroup, WKStringRef userContentFilterName) __attribute__((unavailable));
+
#ifdef __cplusplus
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
