<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[180633] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/180633">180633</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-25 12:42:28 -0800 (Wed, 25 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Layout test support for user content filters
https://bugs.webkit.org/show_bug.cgi?id=142018
Reviewed by Tim Horton.
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues): Clear all user content filters between tests.
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformConfigureViewForTest): For all tests with usercontentfilter/ in their path try to load a matching .json
file before loading the test itself.
LayoutTests:
* TestExpectations:
* http/tests/usercontentfilter/basic-filter.html: Added.
* http/tests/usercontentfilter/basic-filter.html.json: Added.
* platform/mac-wk2/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacTestControllerMacmm">trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/http/tests/usercontentfilter/</li>
<li><a href="#trunkLayoutTestshttptestsusercontentfilterbasicfilterhtml">trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfilterbasicfilterhtmljson">trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html.json</a></li>
<li>trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/</li>
<li><a href="#trunkLayoutTestsplatformmachttptestsusercontentfilterbasicfilterexpectedtxt">trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180632 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-25 18:56:48 UTC (rev 180632)
+++ trunk/LayoutTests/ChangeLog 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-25 Brady Eidson <beidson@apple.com>
+
+ Layout test support for user content filters
+ https://bugs.webkit.org/show_bug.cgi?id=142018
+
+ Reviewed by Tim Horton.
+
+ * TestExpectations:
+ * http/tests/usercontentfilter/basic-filter.html: Added.
+ * http/tests/usercontentfilter/basic-filter.html.json: Added.
+ * platform/mac-wk2/TestExpectations:
+
</ins><span class="cx"> 2015-02-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Skip new <attachment> test since it's not working on Windows.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (180632 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-02-25 18:56:48 UTC (rev 180632)
+++ trunk/LayoutTests/TestExpectations 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -485,3 +485,6 @@
</span><span class="cx"> webkit.org/b/141488 fast/replaced/pdf-as-object-and-embed.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/141695 [ Debug ] fast/selectors/nth-last-child-of-register-requirement.html [ Slow ]
</span><ins>+
+# UserContentFilters are Mac-WK2-only for now
+http/tests/usercontentfilter [ Skip ]
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterbasicfilterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html (0 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html (rev 0)
+++ trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<body>
+The image below should not actually load.<br>
+<img src="http://localhost:8000/resources/square100.png">
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterbasicfilterhtmljson"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html.json (0 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html.json 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": "http://localhost"
+ }
+ }
+]
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmachttptestsusercontentfilterbasicfilterexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt (0 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderText {#text} at (0,0) size 273x18
+ text run at (0,0) width 273: "The image below should not actually load."
+ RenderBR {BR} at (272,14) size 1x0
+ RenderImage {IMG} at (0,18) size 0x0
+ RenderText {#text} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (180632 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2015-02-25 18:56:48 UTC (rev 180632)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -521,3 +521,7 @@
</span><span class="cx">
</span><span class="cx"> ### END OF (7) New WebKit2-only failures in Yosemite
</span><span class="cx"> ########################################
</span><ins>+
+# UserContentFilters are skipped globally, but work on mac-wk2
+http/tests/usercontentfilter [ Pass ]
+
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180632 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-25 18:56:48 UTC (rev 180632)
+++ trunk/Tools/ChangeLog 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-02-25 Brady Eidson <beidson@apple.com>
+
+ Layout test support for user content filters
+ https://bugs.webkit.org/show_bug.cgi?id=142018
+
+ Reviewed by Tim Horton.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues): Clear all user content filters between tests.
+
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformConfigureViewForTest): For all tests with usercontentfilter/ in their path try to load a matching .json
+ file before loading the test itself.
+
</ins><span class="cx"> 2015-02-24 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Convert WebEditingTester to use xcconfig files
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (180632 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-02-25 18:56:48 UTC (rev 180632)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -668,6 +668,8 @@
</span><span class="cx">
</span><span class="cx"> m_shouldLogHistoryClientCallbacks = false;
</span><span class="cx">
</span><ins>+ WKPageGroupRemoveAllUserContentFilters(WKPageGetPageGroup(m_mainWebView->page()));
+
</ins><span class="cx"> // Reset main page back to about:blank
</span><span class="cx"> m_doneResetting = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacTestControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (180632 => 180633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-02-25 18:56:48 UTC (rev 180632)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-02-25 20:42:28 UTC (rev 180633)
</span><span class="lines">@@ -32,7 +32,9 @@
</span><span class="cx"> #import "TestInvocation.h"
</span><span class="cx"> #import "WebKitTestRunnerPasteboard.h"
</span><span class="cx"> #import <WebKit/WKStringCF.h>
</span><del>-#import <mach-o/dyld.h>
</del><ins>+#import <WebKit/WKURLCF.h>
+#import <WebKit/WKUserContentFilterRef.h>
+#import <mach-o/dyld.h>
</ins><span class="cx">
</span><span class="cx"> @interface NSSound (Details)
</span><span class="cx"> + (void)_setAlertType:(NSUInteger)alertType;
</span><span class="lines">@@ -94,6 +96,28 @@
</span><span class="cx"> WKDictionarySetItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
</span><span class="cx">
</span><span class="cx"> ensureViewSupportsOptions(viewOptions.get());
</span><ins>+
+ WKURLRef url = test.url();
+ WKRetainPtr<WKStringRef> urlString = adoptWK(WKURLCopyString(url));
+
+ char urlCString[16384];
+ WKStringGetUTF8CString(urlString.get(), urlCString, 16384);
+ if (!strstr(urlCString, "usercontentfilter/"))
+ return;
+
+ RetainPtr<CFURLRef> testURL = adoptCF(WKURLCopyCFURL(kCFAllocatorDefault, url));
+ NSURL *filterURL = [(NSURL *)testURL.get() URLByAppendingPathExtension:@"json"];
+
+ NSStringEncoding encoding;
+ NSString *contentFilterString = [NSString stringWithContentsOfURL:filterURL usedEncoding:&encoding error:NULL];
+ if (!contentFilterString)
+ return;
+
+ WKRetainPtr<WKStringRef> name = adoptWK(WKStringCreateWithUTF8CString("TestContentFilter"));
+ WKRetainPtr<WKStringRef> contentFilterStringWK = adoptWK(WKStringCreateWithCFString((CFStringRef)contentFilterString));
+ WKRetainPtr<WKUserContentFilterRef> filter = adoptWK(WKUserContentFilterCreate(name.get(), contentFilterStringWK.get()));
+
+ WKPageGroupAddUserContentFilter(WKPageGetPageGroup(TestController::singleton().mainWebView()->page()), filter.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::platformRunUntil(bool& done, double timeout)
</span></span></pre>
</div>
</div>
</body>
</html>