<!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>[182564] 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/182564">182564</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-08 13:26:41 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Block popups from content extensions.
https://bugs.webkit.org/show_bug.cgi?id=143497
Reviewed by Brady Eidson.
Source/WebCore:
Test: http/tests/contentextensions/popups.html
* loader/ResourceLoadInfo.cpp:
(WebCore::readResourceType):
* loader/ResourceLoadInfo.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::open):
* page/UserContentController.cpp:
(WebCore::UserContentController::actionsForResourceLoad):
* page/UserContentController.h:
Check content extensions before opening a window.
Tools:
* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::TEST_F):
Added popup test.
LayoutTests:
* http/tests/contentextensions/popups-expected.txt: Added.
* http/tests/contentextensions/popups.html: Added.
* http/tests/contentextensions/popups.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="#trunkSourceWebCoreloaderResourceLoadInfocpp">trunk/Source/WebCore/loader/ResourceLoadInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadInfoh">trunk/Source/WebCore/loader/ResourceLoadInfo.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllercpp">trunk/Source/WebCore/page/UserContentController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllerh">trunk/Source/WebCore/page/UserContentController.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscontentextensionspopupsexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/popups-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionspopupshtml">trunk/LayoutTests/http/tests/contentextensions/popups.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionspopupshtmljson">trunk/LayoutTests/http/tests/contentextensions/popups.html.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/LayoutTests/ChangeLog 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Block popups from content extensions.
+ https://bugs.webkit.org/show_bug.cgi?id=143497
+
+ Reviewed by Brady Eidson.
+
+ * http/tests/contentextensions/popups-expected.txt: Added.
+ * http/tests/contentextensions/popups.html: Added.
+ * http/tests/contentextensions/popups.html.json: Added.
+
</ins><span class="cx"> 2015-04-08 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed test expectation sanity-check
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionspopupsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/popups-expected.txt (0 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/popups-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/popups-expected.txt 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+ALERT: about:blank successfully blocked
+ALERT: data url should not be blocked
+ALERT: data url should not be blocked
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionspopupshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/popups.html (0 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/popups.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/popups.html 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<html>
+<body>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCanOpenWindows(true);
+ testRunner.setCloseRemainingWindowsWhenComplete(true);
+}
+
+win = window.open("about:blank");
+alert(win ? "FAIL" : "about:blank successfully blocked");
+win = window.open("data:text/html, hello");
+alert(win ? "data url should not be blocked" : "FAIL");
+win = window.open("data:text/html, about");
+alert(win ? "data url should not be blocked" : "FAIL");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionspopupshtmljson"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentextensions/popups.html.json (0 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentextensions/popups.html.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/popups.html.json 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": "about",
+ "resource-type":["popup"]
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/Source/WebCore/ChangeLog 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Block popups from content extensions.
+ https://bugs.webkit.org/show_bug.cgi?id=143497
+
+ Reviewed by Brady Eidson.
+
+ Test: http/tests/contentextensions/popups.html
+
+ * loader/ResourceLoadInfo.cpp:
+ (WebCore::readResourceType):
+ * loader/ResourceLoadInfo.h:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::open):
+ * page/UserContentController.cpp:
+ (WebCore::UserContentController::actionsForResourceLoad):
+ * page/UserContentController.h:
+ Check content extensions before opening a window.
+
</ins><span class="cx"> 2015-04-08 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Properly handle negative reference box widths and center coordinates
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadInfo.cpp (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadInfo.cpp 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/Source/WebCore/loader/ResourceLoadInfo.cpp 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -85,6 +85,8 @@
</span><span class="cx"> return static_cast<uint16_t>(ResourceType::SVGDocument);
</span><span class="cx"> if (name == "media")
</span><span class="cx"> return static_cast<uint16_t>(ResourceType::Media);
</span><ins>+ if (name == "popup")
+ return static_cast<uint16_t>(ResourceType::Popup);
</ins><span class="cx"> return static_cast<uint16_t>(ResourceType::Invalid);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadInfo.h (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadInfo.h 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/Source/WebCore/loader/ResourceLoadInfo.h 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -42,12 +42,13 @@
</span><span class="cx"> SVGDocument = 0x0040,
</span><span class="cx"> Media = 0x0080,
</span><span class="cx"> PlugInStream = 0x0100,
</span><ins>+ Popup = 0x0200,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum class LoadType : uint16_t {
</span><span class="cx"> Invalid = 0x0000,
</span><del>- FirstParty = 0x0200,
- ThirdParty = 0x0400,
</del><ins>+ FirstParty = 0x0400,
+ ThirdParty = 0x0800,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef uint16_t ResourceFlags;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> #include "CSSRuleList.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><ins>+#include "ContentExtensionActions.h"
+#include "ContentExtensionRule.h"
</ins><span class="cx"> #include "Crypto.h"
</span><span class="cx"> #include "DOMApplicationCache.h"
</span><span class="cx"> #include "DOMSelection.h"
</span><span class="lines">@@ -81,6 +83,7 @@
</span><span class="cx"> #include "PageTransitionEvent.h"
</span><span class="cx"> #include "Performance.h"
</span><span class="cx"> #include "PlatformScreen.h"
</span><ins>+#include "ResourceLoadInfo.h"
</ins><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "ScheduledAction.h"
</span><span class="cx"> #include "Screen.h"
</span><span class="lines">@@ -2121,24 +2124,39 @@
</span><span class="cx"> DOMWindow& activeWindow, DOMWindow& firstWindow)
</span><span class="cx"> {
</span><span class="cx"> if (!isCurrentlyDisplayedInFrame())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> Document* activeDocument = activeWindow.document();
</span><span class="cx"> if (!activeDocument)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> Frame* firstFrame = firstWindow.frame();
</span><span class="cx"> if (!firstFrame)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ if (firstFrame
+ && firstFrame->document()
+ && firstFrame->mainFrame().page()
+ && firstFrame->mainFrame().page()->userContentController()
+ && firstFrame->mainFrame().document()) {
+ ResourceLoadInfo resourceLoadInfo = {firstFrame->document()->completeURL(urlString), firstFrame->mainFrame().document()->url(), ResourceType::Popup};
+ Vector<ContentExtensions::Action> actions = firstFrame->mainFrame().page()->userContentController()->actionsForResourceLoad(resourceLoadInfo);
+ for (const ContentExtensions::Action& action : actions) {
+ if (action.type() == ContentExtensions::ActionType::BlockLoad)
+ return nullptr;
+ }
+ }
+#endif
+
</ins><span class="cx"> if (!firstWindow.allowPopUp()) {
</span><span class="cx"> // Because FrameTree::find() returns true for empty strings, we must check for empty frame names.
</span><span class="cx"> // Otherwise, illegitimate window.open() calls with no name will pass right through the popup blocker.
</span><span class="cx"> if (frameName.isEmpty() || !m_frame->tree().find(frameName))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Get the target frame for the special cases of _top and _parent.
</span><span class="cx"> // In those cases, we schedule a location change right now and return early.
</span><del>- Frame* targetFrame = 0;
</del><ins>+ Frame* targetFrame = nullptr;
</ins><span class="cx"> if (frameName == "_top")
</span><span class="cx"> targetFrame = &m_frame->tree().top();
</span><span class="cx"> else if (frameName == "_parent") {
</span><span class="lines">@@ -2149,7 +2167,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (targetFrame) {
</span><span class="cx"> if (!activeDocument->canNavigate(targetFrame))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> URL completedURL = firstFrame->document()->completeURL(urlString);
</span><span class="cx">
</span><span class="lines">@@ -2169,7 +2187,7 @@
</span><span class="cx">
</span><span class="cx"> WindowFeatures windowFeatures(windowFeaturesString);
</span><span class="cx"> RefPtr<Frame> result = createWindow(urlString, frameName, windowFeatures, activeWindow, firstFrame, m_frame);
</span><del>- return result ? result->document()->domWindow() : 0;
</del><ins>+ return result ? result->document()->domWindow() : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMWindow::showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, std::function<void (DOMWindow&)> prepareDialogFunction)
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.cpp (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.cpp 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/Source/WebCore/page/UserContentController.cpp 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -212,6 +212,13 @@
</span><span class="cx"> m_contentExtensionBackend->processContentExtensionRulesForLoad(request, resourceType, initiatingDocumentLoader);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<ContentExtensions::Action> UserContentController::actionsForResourceLoad(const ResourceLoadInfo& resourceLoadInfo)
+{
+ if (!m_contentExtensionBackend)
+ return Vector<ContentExtensions::Action>();
+
+ return m_contentExtensionBackend->actionsForResourceLoad(resourceLoadInfo);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void UserContentController::removeAllUserContent()
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.h (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.h 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/Source/WebCore/page/UserContentController.h 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> WEBCORE_EXPORT void removeAllUserContentExtensions();
</span><span class="cx">
</span><span class="cx"> void processContentExtensionRulesForLoad(ResourceRequest&, ResourceType, DocumentLoader& initiatingDocumentLoader);
</span><ins>+ Vector<ContentExtensions::Action> actionsForResourceLoad(const ResourceLoadInfo&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/Tools/ChangeLog 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Block popups from content extensions.
+ https://bugs.webkit.org/show_bug.cgi?id=143497
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (TestWebKitAPI::TEST_F):
+ Added popup test.
+
</ins><span class="cx"> 2015-04-08 Alex Christensen <achristensen@webkit.org> and Patrick Gansterer <paroga@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add CMake build system for WinCairo port.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (182563 => 182564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-04-08 20:24:40 UTC (rev 182563)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-04-08 20:26:41 UTC (rev 182564)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx">
</span><span class="cx"> TEST_F(ContentExtensionTest, ResourceType)
</span><span class="cx"> {
</span><del>- auto backend = makeBackend("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"block_all_types.org\",\"resource-type\":[\"document\",\"image\",\"style-sheet\",\"script\",\"font\",\"raw\",\"svg-document\",\"media\"]}},"
</del><ins>+ auto backend = makeBackend("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"block_all_types.org\",\"resource-type\":[\"document\",\"image\",\"style-sheet\",\"script\",\"font\",\"raw\",\"svg-document\",\"media\",\"popup\"]}},"
</ins><span class="cx"> "{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"block_only_images\",\"resource-type\":[\"image\"]}}]");
</span><span class="cx">
</span><span class="cx"> testRequest(backend, mainDocumentRequest("http://block_all_types.org", ResourceType::Document), { ContentExtensions::ActionType::BlockLoad });
</span><span class="lines">@@ -468,6 +468,7 @@
</span><span class="cx"> testRequest(backend, mainDocumentRequest("http://block_all_types.org", ResourceType::Raw), { ContentExtensions::ActionType::BlockLoad });
</span><span class="cx"> testRequest(backend, mainDocumentRequest("http://block_all_types.org", ResourceType::SVGDocument), { ContentExtensions::ActionType::BlockLoad });
</span><span class="cx"> testRequest(backend, mainDocumentRequest("http://block_all_types.org", ResourceType::Media), { ContentExtensions::ActionType::BlockLoad });
</span><ins>+ testRequest(backend, mainDocumentRequest("http://block_all_types.org", ResourceType::Popup), { ContentExtensions::ActionType::BlockLoad });
</ins><span class="cx"> testRequest(backend, mainDocumentRequest("http://block_only_images.org", ResourceType::Image), { ContentExtensions::ActionType::BlockLoad });
</span><span class="cx"> testRequest(backend, mainDocumentRequest("http://block_only_images.org", ResourceType::Document), { });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>