<!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>[214358] 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/214358">214358</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-03-24 11:17:48 -0700 (Fri, 24 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Content Blocker: Blocking "a[href*=randomString]" doesn't work
https://bugs.webkit.org/show_bug.cgi?id=169167
Reviewed by Simon Fraser.
Source/WebCore:
When testing content extensions, we have always called an API function that internally
has called AtomicString::init somewhere before we start compiling the content extension.
On iOS, though, we call [_WKUserContentExtensionStore compileContentExtensionForIdentifier:...]
without having already called anything that calls AtomicString::init. The new CSS parser is now
failing to parse some selectors because CSSSelectorParser::defaultNamespace is returning starAtom,
which is a null atomic string before AtomicString::init is called.
Covered by a new API test.
* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::isValidCSSSelector):
(WebCore::ContentExtensions::loadAction):
(WebCore::ContentExtensions::isValidSelector): Deleted.
* contentextensions/ContentExtensionParser.h:
Call AtomicString::init before checking if a css selector is valid.
Tools:
* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::TEST_F):
Test an example of a selector that was incorrectly determined to be invalid.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionParsercpp">trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionParserh">trunk/Source/WebCore/contentextensions/ContentExtensionParser.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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214357 => 214358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-24 18:01:18 UTC (rev 214357)
+++ trunk/Source/WebCore/ChangeLog 2017-03-24 18:17:48 UTC (rev 214358)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-03-24 Alex Christensen <achristensen@webkit.org>
+
+ REGRESSION: Content Blocker: Blocking "a[href*=randomString]" doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=169167
+
+ Reviewed by Simon Fraser.
+
+ When testing content extensions, we have always called an API function that internally
+ has called AtomicString::init somewhere before we start compiling the content extension.
+ On iOS, though, we call [_WKUserContentExtensionStore compileContentExtensionForIdentifier:...]
+ without having already called anything that calls AtomicString::init. The new CSS parser is now
+ failing to parse some selectors because CSSSelectorParser::defaultNamespace is returning starAtom,
+ which is a null atomic string before AtomicString::init is called.
+
+ Covered by a new API test.
+
+ * contentextensions/ContentExtensionParser.cpp:
+ (WebCore::ContentExtensions::isValidCSSSelector):
+ (WebCore::ContentExtensions::loadAction):
+ (WebCore::ContentExtensions::isValidSelector): Deleted.
+ * contentextensions/ContentExtensionParser.h:
+ Call AtomicString::init before checking if a css selector is valid.
+
</ins><span class="cx"> 2017-03-24 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Add libwebrtc backend support for RTCRtpSender::replaceTrack
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (214357 => 214358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2017-03-24 18:01:18 UTC (rev 214357)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2017-03-24 18:17:48 UTC (rev 214358)
</span><span class="lines">@@ -231,8 +231,9 @@
</span><span class="cx"> return WTFMove(trigger);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isValidSelector(const String& selector)
</del><ins>+bool isValidCSSSelector(const String& selector)
</ins><span class="cx"> {
</span><ins>+ AtomicString::init();
</ins><span class="cx"> CSSParserContext context(HTMLQuirksMode);
</span><span class="cx"> CSSParser parser(context);
</span><span class="cx"> CSSSelectorList selectorList;
</span><span class="lines">@@ -267,7 +268,7 @@
</span><span class="cx"> return makeUnexpected(ContentExtensionError::JSONInvalidCSSDisplayNoneActionType);
</span><span class="cx">
</span><span class="cx"> String selectorString = asString(selector)->value(&exec);
</span><del>- if (!isValidSelector(selectorString)) {
</del><ins>+ if (!isValidCSSSelector(selectorString)) {
</ins><span class="cx"> // Skip rules with invalid selectors to be backwards-compatible.
</span><span class="cx"> return {std::nullopt};
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.h (214357 => 214358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.h 2017-03-24 18:01:18 UTC (rev 214357)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.h 2017-03-24 18:17:48 UTC (rev 214358)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> class ContentExtensionRule;
</span><span class="cx">
</span><span class="cx"> Expected<Vector<ContentExtensionRule>, std::error_code> parseRuleList(String&&);
</span><ins>+WEBCORE_EXPORT bool isValidCSSSelector(const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace ContentExtensions
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214357 => 214358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-24 18:01:18 UTC (rev 214357)
+++ trunk/Tools/ChangeLog 2017-03-24 18:17:48 UTC (rev 214358)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-24 Alex Christensen <achristensen@webkit.org>
+
+ REGRESSION: Content Blocker: Blocking "a[href*=randomString]" doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=169167
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (TestWebKitAPI::TEST_F):
+ Test an example of a selector that was incorrectly determined to be invalid.
+
</ins><span class="cx"> 2017-03-24 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Increase timeout for booting simulators.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (214357 => 214358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2017-03-24 18:01:18 UTC (rev 214357)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2017-03-24 18:17:48 UTC (rev 214358)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include <WebCore/CombinedURLFilters.h>
</span><span class="cx"> #include <WebCore/ContentExtensionCompiler.h>
</span><span class="cx"> #include <WebCore/ContentExtensionError.h>
</span><ins>+#include <WebCore/ContentExtensionParser.h>
</ins><span class="cx"> #include <WebCore/ContentExtensionsBackend.h>
</span><span class="cx"> #include <WebCore/DFA.h>
</span><span class="cx"> #include <WebCore/DFABytecodeCompiler.h>
</span><span class="lines">@@ -2870,4 +2871,9 @@
</span><span class="cx"> testRequest(searchBackend, mainDocumentRequest("zzz://www.ddjjyyy.xxx/"), { ContentExtensions::ActionType::CSSDisplayNoneSelector });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST_F(ContentExtensionTest, ValidSelector)
+{
+ EXPECT_TRUE(WebCore::ContentExtensions::isValidCSSSelector("a[href*=hsv]"));
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>