<!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>[182820] 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/182820">182820</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-04-14 16:47:01 -0700 (Tue, 14 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure media element loads hit content filter extensions.
<rdar://problem/20014012> and https://bugs.webkit.org/show_bug.cgi?id=143731
Reviewed by Jer Noble.
Source/WebCore:
Tests: http/tests/contentextensions/media-filtered.html
http/tests/contentextensions/text-track-blocked.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute): Skip loads that are filtered.
LayoutTests:
* http/tests/contentextensions/media-filtered-expected.txt: Added.
* http/tests/contentextensions/media-filtered.html: Added.
* http/tests/contentextensions/media-filtered.html.json: Added.
* http/tests/contentextensions/text-track-blocked-expected.txt: Added.
* http/tests/contentextensions/text-track-blocked.html: Added.
* http/tests/contentextensions/text-track-blocked.html.json: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscontentextensionsmediafilteredexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/media-filtered-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsmediafilteredhtml">trunk/LayoutTests/http/tests/contentextensions/media-filtered.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsmediafilteredhtmljson">trunk/LayoutTests/http/tests/contentextensions/media-filtered.html.json</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionstexttrackblockedexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionstexttrackblockedhtml">trunk/LayoutTests/http/tests/contentextensions/text-track-blocked.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionstexttrackblockedhtmljson">trunk/LayoutTests/http/tests/contentextensions/text-track-blocked.html.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182819 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-14 23:45:17 UTC (rev 182819)
+++ trunk/LayoutTests/ChangeLog 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-14 Brady Eidson <beidson@apple.com>
+
+ Make sure media element loads hit content filter extensions.
+ <rdar://problem/20014012> and https://bugs.webkit.org/show_bug.cgi?id=143731
+
+ Reviewed by Jer Noble.
+
+ * http/tests/contentextensions/media-filtered-expected.txt: Added.
+ * http/tests/contentextensions/media-filtered.html: Added.
+ * http/tests/contentextensions/media-filtered.html.json: Added.
+ * http/tests/contentextensions/text-track-blocked-expected.txt: Added.
+ * http/tests/contentextensions/text-track-blocked.html: Added.
+ * http/tests/contentextensions/text-track-blocked.html.json: Added.
+
</ins><span class="cx"> 2015-04-14 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Skip failling test due to list box scroll behavior.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsmediafilteredexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/media-filtered-expected.txt (0 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/media-filtered-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/media-filtered-expected.txt 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+CONSOLE MESSAGE: line 14: Video error
+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 238x18
+ text run at (0,0) width 238: "The following video should not load."
+ RenderBR {BR} at (237,14) size 1x0
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,26) size 300x150
+ RenderVideo {VIDEO} at (0,18) size 300x150
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsmediafilteredhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/media-filtered.html (0 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/media-filtered.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/media-filtered.html 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+function videoCanPlay()
+{
+ console.log("Video can play");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function videoError()
+{
+ console.log("Video error");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+</script>
+The following video should not load.<br>
+<video onerror="videoError();" oncanplay="videoCanPlay();" src="http://localhost:8000/media/resources/test.mp4" autoplay></video>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsmediafilteredhtmljson"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/media-filtered.html.json (0 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/media-filtered.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/media-filtered.html.json 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": ".*test.mp4"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionstexttrackblockedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt (0 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+CONSOLE MESSAGE: line 21: video loaded
+CONSOLE MESSAGE: line 14: vttError
+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 262x18
+ text run at (0,0) width 262: "The following text track should not load."
+ RenderBR {BR} at (261,14) size 1x0
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,26) size 320x240
+ RenderVideo {VIDEO} at (0,18) size 320x240
+layer at (8,26) size 320x240
+ RenderFlexibleBox {DIV} at (0,0) size 320x240
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionstexttrackblockedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/text-track-blocked.html (0 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/text-track-blocked.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/text-track-blocked.html 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+function vttLoaded()
+{
+ console.log("vttLoaded");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function vttError()
+{
+ console.log("vttError");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function videoLoaded()
+{
+ console.log("video loaded");
+ var video = document.getElementById("video");
+ video.textTracks[0].mode = "showing";
+}
+
+</script>
+The following text track should not load.<br>
+<video id="video" src="/media-resources/content/test.mp4" autoplay oncanplay="videoLoaded();">
+<track id="track" src="/media-resources/track/captions-webvtt/captions-fast.vtt" kind="captions" srclang="en" onload="vttLoaded();" onerror="vttError();"></track>
+</video>
+
+
+</video>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionstexttrackblockedhtmljson"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/text-track-blocked.html.json (0 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/text-track-blocked.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/text-track-blocked.html.json 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": ".*captions-fast.vtt"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182819 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-14 23:45:17 UTC (rev 182819)
+++ trunk/Source/WebCore/ChangeLog 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-14 Brady Eidson <beidson@apple.com>
+
+ Make sure media element loads hit content filter extensions.
+ <rdar://problem/20014012> and https://bugs.webkit.org/show_bug.cgi?id=143731
+
+ Reviewed by Jer Noble.
+
+ Tests: http/tests/contentextensions/media-filtered.html
+ http/tests/contentextensions/text-track-blocked.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute): Skip loads that are filtered.
+
</ins><span class="cx"> 2015-04-14 Brian Weinstein <bweinstein@apple.com>
</span><span class="cx">
</span><span class="cx"> Add SPI to clear HSTS hosts added since a date.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (182819 => 182820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-14 23:45:17 UTC (rev 182819)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-14 23:47:01 UTC (rev 182820)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> #include "RenderLayerCompositor.h"
</span><span class="cx"> #include "RenderVideo.h"
</span><span class="cx"> #include "RenderView.h"
</span><ins>+#include "ResourceLoadInfo.h"
</ins><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "SecurityPolicy.h"
</span><span class="lines">@@ -79,6 +80,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "TimeRanges.h"
</span><ins>+#include "UserContentController.h"
</ins><span class="cx"> #include <limits>
</span><span class="cx"> #include <runtime/Uint8Array.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="lines">@@ -1090,7 +1092,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!frame->page()) {
</del><ins>+ Page* page = frame->page();
+ if (!page) {
</ins><span class="cx"> mediaLoadingFailed(MediaPlayer::FormatError);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1101,6 +1104,19 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ ResourceRequest request(url);
+ DocumentLoader* documentLoader = frame->loader().documentLoader();
+
+ if (page->userContentController() && documentLoader)
+ page->userContentController()->processContentExtensionRulesForLoad(request, ResourceType::Media, *documentLoader);
+
+ if (request.isNull()) {
+ mediaLoadingFailed(MediaPlayer::FormatError);
+ return;
+ }
+#endif
+
</ins><span class="cx"> // The resource fetch algorithm
</span><span class="cx"> m_networkState = NETWORK_LOADING;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>