<!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>[178593] trunk/Source/WebCore</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/178593">178593</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-16 13:01:00 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make URL filters case-insensitive by default
https://bugs.webkit.org/show_bug.cgi?id=140531
Reviewed by Andreas Kling.
Safari's filters were case-insensitive. Adopt that convention in the engine,
and add a flag in case someone ever need a case-sensitive filter.
* contentextensions/ContentExtensionRule.h:
* contentextensions/ContentExtensionsBackend.cpp:
(WebCore::ContentExtensions::ContentExtensionsBackend::setRuleList):
* contentextensions/ContentExtensionsManager.cpp:
(WebCore::ContentExtensions::ExtensionsManager::loadTrigger):
* contentextensions/URLFilterParser.cpp:
(WebCore::ContentExtensions::trivialAtomFromASCIICharacter):
(WebCore::ContentExtensions::GraphBuilder::GraphBuilder):
(WebCore::ContentExtensions::GraphBuilder::atomPatternCharacter):
(WebCore::ContentExtensions::GraphBuilder::generateTransition):
(WebCore::ContentExtensions::URLFilterParser::addPattern):
* contentextensions/URLFilterParser.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionRuleh">trunk/Source/WebCore/contentextensions/ContentExtensionRule.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp">trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsManagercpp">trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsURLFilterParsercpp">trunk/Source/WebCore/contentextensions/URLFilterParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsURLFilterParserh">trunk/Source/WebCore/contentextensions/URLFilterParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178592 => 178593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-16 20:57:04 UTC (rev 178592)
+++ trunk/Source/WebCore/ChangeLog 2015-01-16 21:01:00 UTC (rev 178593)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-01-16 Benjamin Poulain <benjamin@webkit.org>
+
+ Make URL filters case-insensitive by default
+ https://bugs.webkit.org/show_bug.cgi?id=140531
+
+ Reviewed by Andreas Kling.
+
+ Safari's filters were case-insensitive. Adopt that convention in the engine,
+ and add a flag in case someone ever need a case-sensitive filter.
+
+ * contentextensions/ContentExtensionRule.h:
+ * contentextensions/ContentExtensionsBackend.cpp:
+ (WebCore::ContentExtensions::ContentExtensionsBackend::setRuleList):
+ * contentextensions/ContentExtensionsManager.cpp:
+ (WebCore::ContentExtensions::ExtensionsManager::loadTrigger):
+ * contentextensions/URLFilterParser.cpp:
+ (WebCore::ContentExtensions::trivialAtomFromASCIICharacter):
+ (WebCore::ContentExtensions::GraphBuilder::GraphBuilder):
+ (WebCore::ContentExtensions::GraphBuilder::atomPatternCharacter):
+ (WebCore::ContentExtensions::GraphBuilder::generateTransition):
+ (WebCore::ContentExtensions::URLFilterParser::addPattern):
+ * contentextensions/URLFilterParser.h:
+
</ins><span class="cx"> 2015-01-16 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the alternative syntax for CSS Selector's descendant combinator (">>")
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionRule.h (178592 => 178593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionRule.h 2015-01-16 20:57:04 UTC (rev 178592)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionRule.h 2015-01-16 21:01:00 UTC (rev 178593)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> public:
</span><span class="cx"> struct Trigger {
</span><span class="cx"> String urlFilter;
</span><ins>+ bool urlFilterIsCaseSensitive = false;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct Action {
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (178592 => 178593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-01-16 20:57:04 UTC (rev 178592)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-01-16 21:01:00 UTC (rev 178593)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> const ContentExtensionRule::Trigger& trigger = contentExtensionRule.trigger();
</span><span class="cx"> ASSERT(trigger.urlFilter.length());
</span><span class="cx">
</span><del>- String error = urlFilterParser.addPattern(trigger.urlFilter, ruleIndex);
</del><ins>+ String error = urlFilterParser.addPattern(trigger.urlFilter, trigger.urlFilterIsCaseSensitive, ruleIndex);
</ins><span class="cx">
</span><span class="cx"> if (!error.isNull()) {
</span><span class="cx"> dataLogF("Error while parsing %s: %s\n", trigger.urlFilter.utf8().data(), error.utf8().data());
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp (178592 => 178593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp 2015-01-16 20:57:04 UTC (rev 178592)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp 2015-01-16 21:01:00 UTC (rev 178593)
</span><span class="lines">@@ -67,8 +67,12 @@
</span><span class="cx"> WTFLogAlways("Invalid url-filter object. The url is empty.");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+ trigger.urlFilter = urlFilter;
</ins><span class="cx">
</span><del>- trigger.urlFilter = urlFilter;
</del><ins>+ JSValue urlFilterCaseObject = triggerObject.get(&exec, Identifier(&exec, "url-filter-is-case-sensitive"));
+ if (urlFilterCaseObject && !exec.hadException() && urlFilterCaseObject.isBoolean())
+ trigger.urlFilterIsCaseSensitive = urlFilterCaseObject.toBoolean(&exec);
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsURLFilterParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/URLFilterParser.cpp (178592 => 178593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/URLFilterParser.cpp 2015-01-16 20:57:04 UTC (rev 178592)
+++ trunk/Source/WebCore/contentextensions/URLFilterParser.cpp 2015-01-16 21:01:00 UTC (rev 178593)
</span><span class="lines">@@ -38,12 +38,16 @@
</span><span class="cx"> const uint16_t hasNonCharacterMask = 0x0080;
</span><span class="cx"> const uint16_t characterMask = 0x0007F;
</span><span class="cx"> const uint16_t newlineClassIDBuiltinMask = 0x100;
</span><ins>+const uint16_t caseInsensitiveMask = 0x200;
</ins><span class="cx">
</span><del>-static TrivialAtom trivialAtomFromASCIICharacter(char character)
</del><ins>+static TrivialAtom trivialAtomFromASCIICharacter(char character, bool caseSensitive)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isASCII(character));
</span><span class="cx">
</span><del>- return static_cast<uint16_t>(character);
</del><ins>+ if (caseSensitive || !isASCIIAlpha(character))
+ return static_cast<uint16_t>(character);
+
+ return static_cast<uint16_t>(toASCIILower(character)) | caseInsensitiveMask;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> enum class TrivialAtomQuantifier : uint16_t {
</span><span class="lines">@@ -71,8 +75,9 @@
</span><span class="cx"> unsigned end;
</span><span class="cx"> };
</span><span class="cx"> public:
</span><del>- GraphBuilder(NFA& nfa, PrefixTreeEntry& prefixTreeRoot, uint64_t patternId)
</del><ins>+ GraphBuilder(NFA& nfa, PrefixTreeEntry& prefixTreeRoot, bool patternIsCaseSensitive, uint64_t patternId)
</ins><span class="cx"> : m_nfa(nfa)
</span><ins>+ , m_patternIsCaseSensitive(patternIsCaseSensitive)
</ins><span class="cx"> , m_patternId(patternId)
</span><span class="cx"> , m_activeGroup({ nfa.root(), nfa.root() })
</span><span class="cx"> , m_lastPrefixTreeEntry(&prefixTreeRoot)
</span><span class="lines">@@ -113,7 +118,7 @@
</span><span class="cx"> m_hasValidAtom = true;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_lastPrefixTreeEntry);
</span><del>- m_pendingTrivialAtom = trivialAtomFromASCIICharacter(asciiChararacter);
</del><ins>+ m_pendingTrivialAtom = trivialAtomFromASCIICharacter(asciiChararacter, m_patternIsCaseSensitive);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void atomBuiltInCharacterClass(JSC::Yarr::BuiltInCharacterClassID builtInCharacterClassID, bool inverted)
</span><span class="lines">@@ -240,8 +245,14 @@
</span><span class="cx"> ASSERT(trivialAtom & newlineClassIDBuiltinMask);
</span><span class="cx"> for (unsigned i = 1; i < 128; ++i)
</span><span class="cx"> m_nfa.addTransition(source, target, i);
</span><del>- } else
- m_nfa.addTransition(source, target, static_cast<char>(trivialAtom & characterMask));
</del><ins>+ } else {
+ if (trivialAtom & caseInsensitiveMask) {
+ char character = static_cast<char>(trivialAtom & characterMask);
+ m_nfa.addTransition(source, target, character);
+ m_nfa.addTransition(source, target, toASCIIUpper(character));
+ } else
+ m_nfa.addTransition(source, target, static_cast<char>(trivialAtom & characterMask));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BoundedSubGraph sinkTrivialAtom(TrivialAtom trivialAtom, unsigned start)
</span><span class="lines">@@ -330,6 +341,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NFA& m_nfa;
</span><ins>+ bool m_patternIsCaseSensitive;
</ins><span class="cx"> const uint64_t m_patternId;
</span><span class="cx">
</span><span class="cx"> BoundedSubGraph m_activeGroup;
</span><span class="lines">@@ -350,7 +362,7 @@
</span><span class="cx"> m_prefixTreeRoot.nfaNode = nfa.root();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String URLFilterParser::addPattern(const String& pattern, uint64_t patternId)
</del><ins>+String URLFilterParser::addPattern(const String& pattern, bool patternIsCaseSensitive, uint64_t patternId)
</ins><span class="cx"> {
</span><span class="cx"> if (!pattern.containsOnlyASCII())
</span><span class="cx"> return ASCIILiteral("URLFilterParser only supports ASCII patterns.");
</span><span class="lines">@@ -363,7 +375,7 @@
</span><span class="cx">
</span><span class="cx"> String error;
</span><span class="cx">
</span><del>- GraphBuilder graphBuilder(m_nfa, m_prefixTreeRoot, patternId);
</del><ins>+ GraphBuilder graphBuilder(m_nfa, m_prefixTreeRoot, patternIsCaseSensitive, patternId);
</ins><span class="cx"> error = String(JSC::Yarr::parse(graphBuilder, pattern, 0));
</span><span class="cx"> if (error.isNull())
</span><span class="cx"> graphBuilder.finalize();
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsURLFilterParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/URLFilterParser.h (178592 => 178593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/URLFilterParser.h 2015-01-16 20:57:04 UTC (rev 178592)
+++ trunk/Source/WebCore/contentextensions/URLFilterParser.h 2015-01-16 21:01:00 UTC (rev 178593)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> class URLFilterParser {
</span><span class="cx"> public:
</span><span class="cx"> explicit URLFilterParser(NFA&);
</span><del>- String addPattern(const String& pattern, uint64_t patternId);
</del><ins>+ String addPattern(const String& pattern, bool patternIsCaseSensitive, uint64_t patternId);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NFA& m_nfa;
</span></span></pre>
</div>
</div>
</body>
</html>