Title: [180687] trunk
Revision
180687
Author
beid...@apple.com
Date
2015-02-26 11:29:48 -0800 (Thu, 26 Feb 2015)

Log Message

Make WKPageGroupRemoveAllUserContentFilters actually remove all user content filters
https://bugs.webkit.org/show_bug.cgi?id=142047

Reviewed by Geoff Garen.

Source/WebKit2:

* UIProcess/API/C/WKPageGroup.cpp:
(WKPageGroupRemoveAllUserContentFilters): Remove all content filters instead of removing all user scripts.

LayoutTests:

* platform/mac-wk2/TestExpectations: Renable content filter tests, as they should no longer interfere with others.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (180686 => 180687)


--- trunk/LayoutTests/ChangeLog	2015-02-26 19:16:30 UTC (rev 180686)
+++ trunk/LayoutTests/ChangeLog	2015-02-26 19:29:48 UTC (rev 180687)
@@ -1,3 +1,12 @@
+2015-02-26  Brady Eidson  <beid...@apple.com>
+
+        Make WKPageGroupRemoveAllUserContentFilters actually remove all user content filters
+        https://bugs.webkit.org/show_bug.cgi?id=142047
+
+        Reviewed by Geoff Garen.
+
+        * platform/mac-wk2/TestExpectations: Renable content filter tests, as they should no longer interfere with others.
+
 2015-02-26  Said Abou-Hallawa  <sabouhall...@apple.com>
 
         Cleanup RenderSVGResourceClipper class.

Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (180686 => 180687)


--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2015-02-26 19:16:30 UTC (rev 180686)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2015-02-26 19:29:48 UTC (rev 180687)
@@ -516,3 +516,5 @@
 
 ### END OF (7) New WebKit2-only failures in Yosemite
 ########################################
+
+http/tests/usercontentfilter [ Pass ]
\ No newline at end of file

Modified: trunk/Source/WebKit2/ChangeLog (180686 => 180687)


--- trunk/Source/WebKit2/ChangeLog	2015-02-26 19:16:30 UTC (rev 180686)
+++ trunk/Source/WebKit2/ChangeLog	2015-02-26 19:29:48 UTC (rev 180687)
@@ -1,3 +1,13 @@
+2015-02-26  Brady Eidson  <beid...@apple.com>
+
+        Make WKPageGroupRemoveAllUserContentFilters actually remove all user content filters
+        https://bugs.webkit.org/show_bug.cgi?id=142047
+
+        Reviewed by Geoff Garen.
+
+        * UIProcess/API/C/WKPageGroup.cpp:
+        (WKPageGroupRemoveAllUserContentFilters): Remove all content filters instead of removing all user scripts.
+
 2015-02-25  Anders Carlsson  <ander...@apple.com>
 
         Add (unused for now) code to delete website data for a set of origins

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp (180686 => 180687)


--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp	2015-02-26 19:16:30 UTC (rev 180686)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp	2015-02-26 19:29:48 UTC (rev 180687)
@@ -92,7 +92,7 @@
 void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroupRef)
 {
 #if ENABLE(CONTENT_EXTENSIONS)
-    toImpl(pageGroupRef)->removeAllUserScripts();
+    toImpl(pageGroupRef)->removeAllUserContentFilters();
 #else
     UNUSED_PARAM(pageGroupRef);
 #endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to