Title: [207149] trunk/Source/WebKit2
- Revision
- 207149
- Author
- [email protected]
- Date
- 2016-10-11 10:05:04 -0700 (Tue, 11 Oct 2016)
Log Message
Move no longer used functions to WKDeprecatedFunctions.cpp
https://bugs.webkit.org/show_bug.cgi?id=163290
Reviewed by Dan Bernstein.
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKPageGroupAddUserContentFilter):
(WKPageGroupRemoveUserContentFilter):
(WKPageGroupRemoveAllUserContentFilters):
(WKContextSetProcessModel): Deleted.
* UIProcess/API/C/WKPageGroup.cpp:
(WKPageGroupRemoveAllUserScripts):
(WKPageGroupAddUserContentFilter): Deleted.
(WKPageGroupRemoveUserContentFilter): Deleted.
(WKPageGroupRemoveAllUserContentFilters): Deleted.
* UIProcess/API/C/WKPageGroup.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (207148 => 207149)
--- trunk/Source/WebKit2/ChangeLog 2016-10-11 16:49:40 UTC (rev 207148)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-11 17:05:04 UTC (rev 207149)
@@ -1,3 +1,22 @@
+2016-10-11 Anders Carlsson <[email protected]>
+
+ Move no longer used functions to WKDeprecatedFunctions.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=163290
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKPageGroupAddUserContentFilter):
+ (WKPageGroupRemoveUserContentFilter):
+ (WKPageGroupRemoveAllUserContentFilters):
+ (WKContextSetProcessModel): Deleted.
+ * UIProcess/API/C/WKPageGroup.cpp:
+ (WKPageGroupRemoveAllUserScripts):
+ (WKPageGroupAddUserContentFilter): Deleted.
+ (WKPageGroupRemoveUserContentFilter): Deleted.
+ (WKPageGroupRemoveAllUserContentFilters): Deleted.
+ * UIProcess/API/C/WKPageGroup.h:
+
2016-10-11 Konstantin Tokarev <[email protected]>
Use modern for loops for iterating supplement maps
Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (207148 => 207149)
--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2016-10-11 16:49:40 UTC (rev 207148)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2016-10-11 17:05:04 UTC (rev 207149)
@@ -26,11 +26,13 @@
#include "config.h"
#include "APIDictionary.h"
+#include "APIUserContentExtension.h"
+#include "WKAPICast.h"
#include "WKArray.h"
#include "WKContextPrivate.h"
#include "WKMutableDictionary.h"
#include "WKPreferencesRefPrivate.h"
-#include "WKSharedAPICast.h"
+#include "WebPageGroup.h"
#if PLATFORM(MAC)
#include "WKContextPrivateMac.h"
@@ -38,6 +40,12 @@
// Deprecated functions that should be removed from the framework once nobody uses them.
+extern "C" {
+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)
@@ -47,3 +55,33 @@
void WKContextSetProcessModel(WKContextRef, WKProcessModel)
{
}
+
+void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroupRef, WKUserContentFilterRef userContentFilterRef)
+{
+#if ENABLE(CONTENT_EXTENSIONS)
+ toImpl(pageGroupRef)->addUserContentExtension(*toImpl(userContentFilterRef));
+#else
+ UNUSED_PARAM(pageGroupRef);
+ UNUSED_PARAM(userContentFilterRef);
+#endif
+}
+
+void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroupRef, WKStringRef userContentFilterNameRef)
+{
+#if ENABLE(CONTENT_EXTENSIONS)
+ toImpl(pageGroupRef)->removeUserContentExtension(toWTFString(userContentFilterNameRef));
+#else
+ UNUSED_PARAM(pageGroupRef);
+ UNUSED_PARAM(userContentFilterNameRef);
+#endif
+}
+
+
+void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroupRef)
+{
+#if ENABLE(CONTENT_EXTENSIONS)
+ toImpl(pageGroupRef)->removeAllUserContentExtensions();
+#else
+ UNUSED_PARAM(pageGroupRef);
+#endif
+}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp (207148 => 207149)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp 2016-10-11 16:49:40 UTC (rev 207148)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp 2016-10-11 17:05:04 UTC (rev 207149)
@@ -84,33 +84,3 @@
{
toImpl(pageGroupRef)->removeAllUserScripts();
}
-
-void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroupRef, WKUserContentFilterRef userContentFilterRef)
-{
-#if ENABLE(CONTENT_EXTENSIONS)
- toImpl(pageGroupRef)->addUserContentExtension(*toImpl(userContentFilterRef));
-#else
- UNUSED_PARAM(pageGroupRef);
- UNUSED_PARAM(userContentFilterRef);
-#endif
-}
-
-void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroupRef, WKStringRef userContentFilterNameRef)
-{
-#if ENABLE(CONTENT_EXTENSIONS)
- toImpl(pageGroupRef)->removeUserContentExtension(toWTFString(userContentFilterNameRef));
-#else
- UNUSED_PARAM(pageGroupRef);
- UNUSED_PARAM(userContentFilterNameRef);
-#endif
-}
-
-
-void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroupRef)
-{
-#if ENABLE(CONTENT_EXTENSIONS)
- toImpl(pageGroupRef)->removeAllUserContentExtensions();
-#else
- UNUSED_PARAM(pageGroupRef);
-#endif
-}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h (207148 => 207149)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2016-10-11 16:49:40 UTC (rev 207148)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2016-10-11 17:05:04 UTC (rev 207149)
@@ -51,10 +51,6 @@
WK_EXPORT void WKPageGroupAddUserScript(WKPageGroupRef pageGroup, WKStringRef source, WKURLRef baseURL, WKArrayRef whitelistedURLPatterns, WKArrayRef blacklistedURLPatterns, WKUserContentInjectedFrames, _WKUserScriptInjectionTime);
WK_EXPORT void WKPageGroupRemoveAllUserScripts(WKPageGroupRef pageGroup);
-WK_EXPORT void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroup, WKUserContentFilterRef userContentFilter);
-WK_EXPORT void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroup, WKStringRef userContentFilterName);
-WK_EXPORT void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroup);
-
#ifdef __cplusplus
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
