<!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>[181031] 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/181031">181031</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-04 14:10:21 -0800 (Wed, 04 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move content extensions test to properly named directory.
https://bugs.webkit.org/show_bug.cgi?id=142299
Reviewed by Tim Horton.
Tools:
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformConfigureViewForTest):
LayoutTests:
* TestExpectations:
* http/tests/contentextensions: Added.
* http/tests/contentextensions/basic-filter-expected.txt: Copied from platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt.
* http/tests/contentextensions/basic-filter.html: Copied from http/tests/usercontentfilter/basic-filter.html.
* http/tests/contentextensions/basic-filter.html.hson: Copied from http/tests/usercontentfilter/basic-filter.html.json.
* http/tests/contentextensions/block-cookies-basic-expected.txt: Copied from http/tests/usercontentfilter/block-cookies-basic-expected.txt.
* http/tests/contentextensions/block-cookies-basic.html: Copied from http/tests/usercontentfilter/block-cookies-basic.html.
* http/tests/contentextensions/block-cookies-basic.html.json: Copied from http/tests/usercontentfilter/block-cookies-basic.html.json.
* http/tests/contentextensions/block-cookies-send-expected.txt: Copied from http/tests/usercontentfilter/block-cookies-send-expected.txt.
* http/tests/contentextensions/block-cookies-send.html: Copied from http/tests/usercontentfilter/block-cookies-send.html.
* http/tests/contentextensions/block-cookies-send.html.json: Copied from http/tests/usercontentfilter/block-cookies-send.html.json.
* http/tests/contentextensions/css-display-none-expected.txt: Copied from http/tests/usercontentfilter/css-display-none-expected.txt.
* http/tests/contentextensions/css-display-none.html: Copied from http/tests/usercontentfilter/css-display-none.html.
* http/tests/contentextensions/css-display-none.html.json: Copied from http/tests/usercontentfilter/css-display-none.html.json.
* http/tests/usercontentfilter/basic-filter.html: Removed.
* http/tests/usercontentfilter/basic-filter.html.json: Removed.
* http/tests/usercontentfilter/block-cookies-basic-expected.txt: Removed.
* http/tests/usercontentfilter/block-cookies-basic.html: Removed.
* http/tests/usercontentfilter/block-cookies-basic.html.json: Removed.
* http/tests/usercontentfilter/block-cookies-send-expected.txt: Removed.
* http/tests/usercontentfilter/block-cookies-send.html: Removed.
* http/tests/usercontentfilter/block-cookies-send.html.json: Removed.
* http/tests/usercontentfilter/css-display-none-expected.txt: Removed.
* http/tests/usercontentfilter/css-display-none.html: Removed.
* http/tests/usercontentfilter/css-display-none.html.json: Removed.
* platform/mac-wk2/TestExpectations:
* platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt: Removed.</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="#trunkToolsWebKitTestRunnermacTestControllerMacmm">trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/http/tests/contentextensions/</li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsbasicfilterexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/basic-filter-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsbasicfilterhtml">trunk/LayoutTests/http/tests/contentextensions/basic-filter.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsbasicfilterhtmlhson">trunk/LayoutTests/http/tests/contentextensions/basic-filter.html.hson</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcookiesbasicexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcookiesbasichtml">trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcookiesbasichtmljson">trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic.html.json</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcookiessendexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/block-cookies-send-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcookiessendhtml">trunk/LayoutTests/http/tests/contentextensions/block-cookies-send.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcookiessendhtmljson">trunk/LayoutTests/http/tests/contentextensions/block-cookies-send.html.json</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionscssdisplaynoneexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/css-display-none-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionscssdisplaynonehtml">trunk/LayoutTests/http/tests/contentextensions/css-display-none.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionscssdisplaynonehtmljson">trunk/LayoutTests/http/tests/contentextensions/css-display-none.html.json</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<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><a href="#trunkLayoutTestshttptestsusercontentfilterblockcookiesbasicexpectedtxt">trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfilterblockcookiesbasichtml">trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfilterblockcookiesbasichtmljson">trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html.json</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfilterblockcookiessendexpectedtxt">trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfilterblockcookiessendhtml">trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfilterblockcookiessendhtmljson">trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html.json</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfiltercssdisplaynoneexpectedtxt">trunk/LayoutTests/http/tests/usercontentfilter/css-display-none-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfiltercssdisplaynonehtml">trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html</a></li>
<li><a href="#trunkLayoutTestshttptestsusercontentfiltercssdisplaynonehtmljson">trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html.json</a></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 (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/ChangeLog 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-03-04 Alex Christensen <achristensen@webkit.org>
+
+ Move content extensions test to properly named directory.
+ https://bugs.webkit.org/show_bug.cgi?id=142299
+
+ Reviewed by Tim Horton.
+
+ * TestExpectations:
+ * http/tests/contentextensions: Added.
+ * http/tests/contentextensions/basic-filter-expected.txt: Copied from platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt.
+ * http/tests/contentextensions/basic-filter.html: Copied from http/tests/usercontentfilter/basic-filter.html.
+ * http/tests/contentextensions/basic-filter.html.hson: Copied from http/tests/usercontentfilter/basic-filter.html.json.
+ * http/tests/contentextensions/block-cookies-basic-expected.txt: Copied from http/tests/usercontentfilter/block-cookies-basic-expected.txt.
+ * http/tests/contentextensions/block-cookies-basic.html: Copied from http/tests/usercontentfilter/block-cookies-basic.html.
+ * http/tests/contentextensions/block-cookies-basic.html.json: Copied from http/tests/usercontentfilter/block-cookies-basic.html.json.
+ * http/tests/contentextensions/block-cookies-send-expected.txt: Copied from http/tests/usercontentfilter/block-cookies-send-expected.txt.
+ * http/tests/contentextensions/block-cookies-send.html: Copied from http/tests/usercontentfilter/block-cookies-send.html.
+ * http/tests/contentextensions/block-cookies-send.html.json: Copied from http/tests/usercontentfilter/block-cookies-send.html.json.
+ * http/tests/contentextensions/css-display-none-expected.txt: Copied from http/tests/usercontentfilter/css-display-none-expected.txt.
+ * http/tests/contentextensions/css-display-none.html: Copied from http/tests/usercontentfilter/css-display-none.html.
+ * http/tests/contentextensions/css-display-none.html.json: Copied from http/tests/usercontentfilter/css-display-none.html.json.
+ * http/tests/usercontentfilter/basic-filter.html: Removed.
+ * http/tests/usercontentfilter/basic-filter.html.json: Removed.
+ * http/tests/usercontentfilter/block-cookies-basic-expected.txt: Removed.
+ * http/tests/usercontentfilter/block-cookies-basic.html: Removed.
+ * http/tests/usercontentfilter/block-cookies-basic.html.json: Removed.
+ * http/tests/usercontentfilter/block-cookies-send-expected.txt: Removed.
+ * http/tests/usercontentfilter/block-cookies-send.html: Removed.
+ * http/tests/usercontentfilter/block-cookies-send.html.json: Removed.
+ * http/tests/usercontentfilter/css-display-none-expected.txt: Removed.
+ * http/tests/usercontentfilter/css-display-none.html: Removed.
+ * http/tests/usercontentfilter/css-display-none.html.json: Removed.
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt: Removed.
+
</ins><span class="cx"> 2015-03-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Rebaseline a few tests. Mark some failures.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/TestExpectations 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -485,5 +485,5 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/141695 [ Debug ] fast/selectors/nth-last-child-of-register-requirement.html [ Slow ]
</span><span class="cx">
</span><del>-# UserContentFilters are Mac-WK2-only for now
-http/tests/usercontentfilter [ Skip ]
</del><ins>+# Content extensions are Mac-WK2-only for now
+http/tests/contentextensions [ Skip ]
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsbasicfilterexpectedtxtfromrev181000trunkLayoutTestsplatformmachttptestsusercontentfilterbasicfilterexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/basic-filter-expected.txt (from rev 181000, trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/basic-filter-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/basic-filter-expected.txt 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,23 @@
</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 200x18
+ text run at (0,0) width 200: "The images below should load."
+ RenderBR {BR} at (199,14) size 1x0
+ RenderImage {IMG} at (0,18) size 100x100
+ RenderBR {BR} at (100,118) size 0x0
+ RenderImage {IMG} at (0,118) size 100x100
+ RenderBR {BR} at (100,218) size 0x0
+ RenderImage {IMG} at (0,218) size 100x100
+ RenderBR {BR} at (100,318) size 0x0
+ RenderText {#text} at (0,318) size 242x18
+ text run at (0,318) width 242: "The images below should be blocked."
+ RenderBR {BR} at (241,332) size 1x0
+ RenderImage {IMG} at (0,336) size 0x0
+ RenderBR {BR} at (0,336) size 0x0
+ RenderImage {IMG} at (0,336) size 0x0
+ RenderBR {BR} at (0,336) size 0x0
+ RenderImage {IMG} at (0,336) size 0x0
+ RenderBR {BR} at (0,336) size 0x0
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsbasicfilterhtmlfromrev181000trunkLayoutTestshttptestsusercontentfilterbasicfilterhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/basic-filter.html (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/basic-filter.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/basic-filter.html 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<body>
+The images below should load.<br>
+<img src="http://127.0.0.1:8000/resources/square100.png?not_local_host"><br>
+<img src="http://localhost:8000/resources/square100.png?whitelist"><br>
+<img src="http://127.0.0.1:8000/resources/square100.png?whitelist_before_localhost"><br>
+The images below should be blocked.<br>
+<img src="http://localhost:8000/resources/square100.png"><br>
+<img src="http://127.0.0.1:8000/resources/square100.png?localhost_not_at_end"><br>
+<img src="http://127.0.0.1:8000/resources/square100.png?ends_with_localhost"><br>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsbasicfilterhtmlhsonfromrev181000trunkLayoutTestshttptestsusercontentfilterbasicfilterhtmljson"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/basic-filter.html.hson (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html.json) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/basic-filter.html.hson (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/basic-filter.html.hson 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": ".*localhost"
+ }
+ },
+ {
+ "action": {
+ "type": "ignore-previous-rules"
+ },
+ "trigger": {
+ "url-filter": ".*whitelist"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcookiesbasicexpectedtxtfromrev181000trunkLayoutTestshttptestsusercontentfilterblockcookiesbasicexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic-expected.txt (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic-expected.txt) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic-expected.txt 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This image resource sets a cookie. But based on the content rules, setting cookie should be blocked.
+document.cookie should be empty, and its value is ''
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcookiesbasichtmlfromrev181000trunkLayoutTestshttptestsusercontentfilterblockcookiesbasichtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic.html (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic.html 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+function loaded()
+{
+ document.getElementById("logger").innerHTML += "document.cookie should be empty, and its value is '" + document.cookie + "'";
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+
+This image resource sets a cookie. But based on the content rules, setting cookie should be blocked.<br>
+<div id="logger"></div><br>
+<img src="http://127.0.0.1:8000/cookies/resources/cookie-utility.php?queryfunction=setFooCookie" onerror="loaded()">
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcookiesbasichtmljsonfromrev181000trunkLayoutTestshttptestsusercontentfilterblockcookiesbasichtmljson"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic.html.json (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html.json) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/block-cookies-basic.html.json 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block-cookies"
+ },
+ "trigger": {
+ "url-filter": "http://127.0.0.1:8000/cookies/resources/cookie-utility.php"
+ }
+ }
+]
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcookiessendexpectedtxtfromrev181000trunkLayoutTestshttptestsusercontentfilterblockcookiessendexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/block-cookies-send-expected.txt (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send-expected.txt) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/block-cookies-send-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/block-cookies-send-expected.txt 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+This test loads a resource that sets a cookie, then verifies that the cookie is not sent out when it should be blocked.
+After the image, document.cookie is 'foo=awesomevalue'
+After the iframe, document.cookie is 'foo=awesomevalue'
+
+
+--------
+Frame: 'iframe'
+--------
+Cookies are:
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcookiessendhtmlfromrev181000trunkLayoutTestshttptestsusercontentfilterblockcookiessendhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/block-cookies-send.html (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/block-cookies-send.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/block-cookies-send.html 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ testRunner.waitUntilDone();
+}
+
+function iframeDone()
+{
+ document.getElementById("logger").innerHTML += "After the iframe, document.cookie is '" + document.cookie + "'<br>";
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function imageDone()
+{
+ document.getElementById("logger").innerHTML += "After the image, document.cookie is '" + document.cookie + "'<br>";
+ document.getElementById("iframe").onload = iframeDone;
+ document.getElementById("iframe").src = "http://127.0.0.1:8000/cookies/resources/echo-cookies.php";
+}
+
+
+</script>
+
+This test loads a resource that sets a cookie, then verifies that the cookie is not sent out when it should be blocked.<br>
+<div id="logger"></div>
+<img src="http://127.0.0.1:8000/cookies/resources/cookie-utility.php?queryfunction=setFooCookie" onerror="imageDone();">
+<iframe id="iframe"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcookiessendhtmljsonfromrev181000trunkLayoutTestshttptestsusercontentfilterblockcookiessendhtmljson"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/block-cookies-send.html.json (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html.json) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/block-cookies-send.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/block-cookies-send.html.json 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block-cookies"
+ },
+ "trigger": {
+ "url-filter": "http://127.0.0.1:8000/cookies/resources/echo-cookies"
+ }
+ }
+]
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionscssdisplaynoneexpectedtxtfromrev181000trunkLayoutTestshttptestsusercontentfiltercssdisplaynoneexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/css-display-none-expected.txt (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/css-display-none-expected.txt) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/css-display-none-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/css-display-none-expected.txt 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,14 @@
</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 784x576
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 492x18
+ text run at (0,0) width 492: "This text should not be visible once the css selector is applied (not done yet)."
+ RenderBlock {P} at (0,34) size 784x18
+ RenderText {#text} at (0,0) size 522x18
+ text run at (0,0) width 522: "This text should also not be visible once the css selector is applied (not done yet)."
+ RenderBlock {P} at (0,68) size 784x18
+ RenderText {#text} at (0,0) size 173x18
+ text run at (0,0) width 173: "This text should be visible."
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionscssdisplaynonehtmlfromrev181000trunkLayoutTestshttptestsusercontentfiltercssdisplaynonehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/css-display-none.html (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/css-display-none.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/css-display-none.html 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<body>
+<p class="hidden">This text should not be visible once the css selector is applied (not done yet).</p>
+<p class="hidden_Ž">This text should also not be visible once the css selector is applied (not done yet).</p>
+<p class="not_hidden">This text should be visible.</p>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionscssdisplaynonehtmljsonfromrev181000trunkLayoutTestshttptestsusercontentfiltercssdisplaynonehtmljson"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/contentextensions/css-display-none.html.json (from rev 181000, trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html.json) (0 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/css-display-none.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/css-display-none.html.json 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "css-display-none",
+ "selector": ".hidden"
+ },
+ "trigger": {
+ "url-filter": ".*css-display-none.html"
+ }
+ },
+ {
+ "action": {
+ "type": "css-display-none",
+ "selector": ".hidden_\u017D"
+ },
+ "trigger": {
+ "url-filter": ".*css-display-none.html"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterbasicfilterhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-<body>
-The images below should load.<br>
-<img src="http://127.0.0.1:8000/resources/square100.png?not_local_host"><br>
-<img src="http://localhost:8000/resources/square100.png?whitelist"><br>
-<img src="http://127.0.0.1:8000/resources/square100.png?whitelist_before_localhost"><br>
-The images below should be blocked.<br>
-<img src="http://localhost:8000/resources/square100.png"><br>
-<img src="http://127.0.0.1:8000/resources/square100.png?localhost_not_at_end"><br>
-<img src="http://127.0.0.1:8000/resources/square100.png?ends_with_localhost"><br>
-</body>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterbasicfilterhtmljson"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html.json (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html.json 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/basic-filter.html.json 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-[
- {
- "action": {
- "type": "block"
- },
- "trigger": {
- "url-filter": ".*localhost"
- }
- },
- {
- "action": {
- "type": "ignore-previous-rules"
- },
- "trigger": {
- "url-filter": ".*whitelist"
- }
- }
-]
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterblockcookiesbasicexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic-expected.txt (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic-expected.txt 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic-expected.txt 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-This image resource sets a cookie. But based on the content rules, setting cookie should be blocked.
-document.cookie should be empty, and its value is ''
-
-
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterblockcookiesbasichtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function loaded()
-{
- document.getElementById("logger").innerHTML += "document.cookie should be empty, and its value is '" + document.cookie + "'";
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-</script>
-
-This image resource sets a cookie. But based on the content rules, setting cookie should be blocked.<br>
-<div id="logger"></div><br>
-<img src="http://127.0.0.1:8000/cookies/resources/cookie-utility.php?queryfunction=setFooCookie" onerror="loaded()">
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterblockcookiesbasichtmljson"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html.json (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html.json 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-basic.html.json 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-[
- {
- "action": {
- "type": "block-cookies"
- },
- "trigger": {
- "url-filter": "http://127.0.0.1:8000/cookies/resources/cookie-utility.php"
- }
- }
-]
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterblockcookiessendexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send-expected.txt (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send-expected.txt 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send-expected.txt 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-This test loads a resource that sets a cookie, then verifies that the cookie is not sent out when it should be blocked.
-After the image, document.cookie is 'foo=awesomevalue'
-After the iframe, document.cookie is 'foo=awesomevalue'
-
-
---------
-Frame: 'iframe'
---------
-Cookies are:
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterblockcookiessendhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpChildFramesAsText();
- testRunner.waitUntilDone();
-}
-
-function iframeDone()
-{
- document.getElementById("logger").innerHTML += "After the iframe, document.cookie is '" + document.cookie + "'<br>";
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function imageDone()
-{
- document.getElementById("logger").innerHTML += "After the image, document.cookie is '" + document.cookie + "'<br>";
- document.getElementById("iframe").onload = iframeDone;
- document.getElementById("iframe").src = "http://127.0.0.1:8000/cookies/resources/echo-cookies.php";
-}
-
-
-</script>
-
-This test loads a resource that sets a cookie, then verifies that the cookie is not sent out when it should be blocked.<br>
-<div id="logger"></div>
-<img src="http://127.0.0.1:8000/cookies/resources/cookie-utility.php?queryfunction=setFooCookie" onerror="imageDone();">
-<iframe id="iframe"></iframe>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfilterblockcookiessendhtmljson"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html.json (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html.json 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/block-cookies-send.html.json 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-[
- {
- "action": {
- "type": "block-cookies"
- },
- "trigger": {
- "url-filter": "http://127.0.0.1:8000/cookies/resources/echo-cookies"
- }
- }
-]
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfiltercssdisplaynoneexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/css-display-none-expected.txt (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/css-display-none-expected.txt 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/css-display-none-expected.txt 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-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 784x576
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 492x18
- text run at (0,0) width 492: "This text should not be visible once the css selector is applied (not done yet)."
- RenderBlock {P} at (0,34) size 784x18
- RenderText {#text} at (0,0) size 522x18
- text run at (0,0) width 522: "This text should also not be visible once the css selector is applied (not done yet)."
- RenderBlock {P} at (0,68) size 784x18
- RenderText {#text} at (0,0) size 173x18
- text run at (0,0) width 173: "This text should be visible."
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfiltercssdisplaynonehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-<body>
-<p class="hidden">This text should not be visible once the css selector is applied (not done yet).</p>
-<p class="hidden_Ž">This text should also not be visible once the css selector is applied (not done yet).</p>
-<p class="not_hidden">This text should be visible.</p>
-</body>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsusercontentfiltercssdisplaynonehtmljson"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html.json (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html.json 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/http/tests/usercontentfilter/css-display-none.html.json 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-[
- {
- "action": {
- "type": "css-display-none",
- "selector": ".hidden"
- },
- "trigger": {
- "url-filter": ".*css-display-none.html"
- }
- },
- {
- "action": {
- "type": "css-display-none",
- "selector": ".hidden_\u017D"
- },
- "trigger": {
- "url-filter": ".*css-display-none.html"
- }
- }
-]
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmachttptestsusercontentfilterbasicfilterexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-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 200x18
- text run at (0,0) width 200: "The images below should load."
- RenderBR {BR} at (199,14) size 1x0
- RenderImage {IMG} at (0,18) size 100x100
- RenderBR {BR} at (100,118) size 0x0
- RenderImage {IMG} at (0,118) size 100x100
- RenderBR {BR} at (100,218) size 0x0
- RenderImage {IMG} at (0,218) size 100x100
- RenderBR {BR} at (100,318) size 0x0
- RenderText {#text} at (0,318) size 242x18
- text run at (0,318) width 242: "The images below should be blocked."
- RenderBR {BR} at (241,332) size 1x0
- RenderImage {IMG} at (0,336) size 0x0
- RenderBR {BR} at (0,336) size 0x0
- RenderImage {IMG} at (0,336) size 0x0
- RenderBR {BR} at (0,336) size 0x0
- RenderImage {IMG} at (0,336) size 0x0
- RenderBR {BR} at (0,336) size 0x0
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -513,4 +513,4 @@
</span><span class="cx"> ### END OF (7) New WebKit2-only failures in Yosemite
</span><span class="cx"> ########################################
</span><span class="cx">
</span><del>-http/tests/usercontentfilter [ Pass ]
</del><span class="cx">\ No newline at end of file
</span><ins>+http/tests/contentextensions [ Pass ]
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/Tools/ChangeLog 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-04 Alex Christensen <achristensen@webkit.org>
+
+ Move content extensions test to properly named directory.
+ https://bugs.webkit.org/show_bug.cgi?id=142299
+
+ Reviewed by Tim Horton.
+
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformConfigureViewForTest):
+
</ins><span class="cx"> 2015-03-04 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> W3C test importer should use filesystem instead of os.walk
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacTestControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (181030 => 181031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-03-04 22:09:54 UTC (rev 181030)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-03-04 22:10:21 UTC (rev 181031)
</span><span class="lines">@@ -97,20 +97,20 @@
</span><span class="cx">
</span><span class="cx"> ensureViewSupportsOptions(viewOptions.get());
</span><span class="cx">
</span><del>- if (!test.urlContains("usercontentfilter/"))
</del><ins>+ if (!test.urlContains("contentextensions/"))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFURLRef> testURL = adoptCF(WKURLCopyCFURL(kCFAllocatorDefault, test.url()));
</span><span class="cx"> NSURL *filterURL = [(NSURL *)testURL.get() URLByAppendingPathExtension:@"json"];
</span><span class="cx">
</span><span class="cx"> NSStringEncoding encoding;
</span><del>- NSString *contentFilterString = [NSString stringWithContentsOfURL:filterURL usedEncoding:&encoding error:NULL];
- if (!contentFilterString)
</del><ins>+ NSString *contentExtensionString = [NSString stringWithContentsOfURL:filterURL usedEncoding:&encoding error:NULL];
+ if (!contentExtensionString)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- WKRetainPtr<WKStringRef> name = adoptWK(WKStringCreateWithUTF8CString("TestContentFilter"));
- WKRetainPtr<WKStringRef> contentFilterStringWK = adoptWK(WKStringCreateWithCFString((CFStringRef)contentFilterString));
- WKRetainPtr<WKUserContentFilterRef> filter = adoptWK(WKUserContentFilterCreate(name.get(), contentFilterStringWK.get()));
</del><ins>+ WKRetainPtr<WKStringRef> name = adoptWK(WKStringCreateWithUTF8CString("TestContentExtensions"));
+ WKRetainPtr<WKStringRef> contentExtensionStringWK = adoptWK(WKStringCreateWithCFString((CFStringRef)contentExtensionString));
+ WKRetainPtr<WKUserContentFilterRef> filter = adoptWK(WKUserContentFilterCreate(name.get(), contentExtensionStringWK.get()));
</ins><span class="cx">
</span><span class="cx"> WKPageGroupAddUserContentFilter(WKPageGetPageGroup(TestController::singleton().mainWebView()->page()), filter.get());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>