<!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>[181726] 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/181726">181726</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-18 21:57:20 -0700 (Wed, 18 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ContentExtensions] Prepare for compiling stylesheets of selectors to be used on every page.
https://bugs.webkit.org/show_bug.cgi?id=142799
Patch by Alex Christensen <achristensen@webkit.org> on 2015-03-18
Reviewed by Brady Eidson.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj:
Make private headers to use with API tests.
* contentextensions/CompiledContentExtension.cpp:
(WebCore::ContentExtensions::CompiledContentExtension::globalDisplayNoneSelectors):
* contentextensions/CompiledContentExtension.h:
Added method to get only the selectors from the root of the DFA, which apply to all URLs.
* contentextensions/ContentExtensionCompiler.cpp:
(WebCore::ContentExtensions::compileRuleList):
Added checking if the trigger will match everything.
These actions can be put directly on the root of the DFA without adding extra epsilon transitions to the NFA.
* contentextensions/DFA.h:
(WebCore::ContentExtensions::DFA::nodeAt):
* contentextensions/DFABytecodeInterpreter.cpp:
(WebCore::ContentExtensions::DFABytecodeInterpreter::actionsFromDFARoot):
(WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
* contentextensions/DFABytecodeInterpreter.h:
* contentextensions/NFA.h:
* contentextensions/URLFilterParser.cpp:
(WebCore::ContentExtensions::Term::quantifier):
Sink terms to a vector then add nodes to NFA when finalizing after checking for regexes that match everything.
(WebCore::ContentExtensions::GraphBuilder::GraphBuilder):
(WebCore::ContentExtensions::GraphBuilder::finalize):
(WebCore::ContentExtensions::GraphBuilder::parseStatus):
(WebCore::ContentExtensions::GraphBuilder::atomPatternCharacter):
(WebCore::ContentExtensions::GraphBuilder::atomBuiltInCharacterClass):
(WebCore::ContentExtensions::GraphBuilder::quantifyAtom):
(WebCore::ContentExtensions::GraphBuilder::atomBackReference):
(WebCore::ContentExtensions::GraphBuilder::assertionBOL):
(WebCore::ContentExtensions::GraphBuilder::assertionWordBoundary):
(WebCore::ContentExtensions::GraphBuilder::atomCharacterClassAtom):
(WebCore::ContentExtensions::GraphBuilder::atomCharacterClassRange):
(WebCore::ContentExtensions::GraphBuilder::atomCharacterClassBuiltIn):
(WebCore::ContentExtensions::GraphBuilder::atomParentheticalAssertionBegin):
(WebCore::ContentExtensions::GraphBuilder::disjunction):
(WebCore::ContentExtensions::GraphBuilder::hasError):
(WebCore::ContentExtensions::GraphBuilder::fail):
(WebCore::ContentExtensions::GraphBuilder::sinkFloatingTermIfNecessary):
(WebCore::ContentExtensions::URLFilterParser::addPattern):
(WebCore::ContentExtensions::URLFilterParser::statusString):
(WebCore::ContentExtensions::GraphBuilder::errorMessage): Deleted.
* contentextensions/URLFilterParser.h:
Use an enum instead of strings for the status to avoid checking strings when we have a regex that matches everything.
Tools:
* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::testPattern):
(TestWebKitAPI::TEST_F):
Start testing regex failures.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsCompiledContentExtensioncpp">trunk/Source/WebCore/contentextensions/CompiledContentExtension.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsCompiledContentExtensionh">trunk/Source/WebCore/contentextensions/CompiledContentExtension.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionCompilercpp">trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFAh">trunk/Source/WebCore/contentextensions/DFA.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFABytecodeInterpretercpp">trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFABytecodeInterpreterh">trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsNFAh">trunk/Source/WebCore/contentextensions/NFA.h</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>
<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 (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/ChangeLog 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2015-03-18 Alex Christensen <achristensen@webkit.org>
+
+ [ContentExtensions] Prepare for compiling stylesheets of selectors to be used on every page.
+ https://bugs.webkit.org/show_bug.cgi?id=142799
+
+ Reviewed by Brady Eidson.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Make private headers to use with API tests.
+ * contentextensions/CompiledContentExtension.cpp:
+ (WebCore::ContentExtensions::CompiledContentExtension::globalDisplayNoneSelectors):
+ * contentextensions/CompiledContentExtension.h:
+ Added method to get only the selectors from the root of the DFA, which apply to all URLs.
+ * contentextensions/ContentExtensionCompiler.cpp:
+ (WebCore::ContentExtensions::compileRuleList):
+ Added checking if the trigger will match everything.
+ These actions can be put directly on the root of the DFA without adding extra epsilon transitions to the NFA.
+ * contentextensions/DFA.h:
+ (WebCore::ContentExtensions::DFA::nodeAt):
+ * contentextensions/DFABytecodeInterpreter.cpp:
+ (WebCore::ContentExtensions::DFABytecodeInterpreter::actionsFromDFARoot):
+ (WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
+ * contentextensions/DFABytecodeInterpreter.h:
+ * contentextensions/NFA.h:
+ * contentextensions/URLFilterParser.cpp:
+ (WebCore::ContentExtensions::Term::quantifier):
+ Sink terms to a vector then add nodes to NFA when finalizing after checking for regexes that match everything.
+ (WebCore::ContentExtensions::GraphBuilder::GraphBuilder):
+ (WebCore::ContentExtensions::GraphBuilder::finalize):
+ (WebCore::ContentExtensions::GraphBuilder::parseStatus):
+ (WebCore::ContentExtensions::GraphBuilder::atomPatternCharacter):
+ (WebCore::ContentExtensions::GraphBuilder::atomBuiltInCharacterClass):
+ (WebCore::ContentExtensions::GraphBuilder::quantifyAtom):
+ (WebCore::ContentExtensions::GraphBuilder::atomBackReference):
+ (WebCore::ContentExtensions::GraphBuilder::assertionBOL):
+ (WebCore::ContentExtensions::GraphBuilder::assertionWordBoundary):
+ (WebCore::ContentExtensions::GraphBuilder::atomCharacterClassAtom):
+ (WebCore::ContentExtensions::GraphBuilder::atomCharacterClassRange):
+ (WebCore::ContentExtensions::GraphBuilder::atomCharacterClassBuiltIn):
+ (WebCore::ContentExtensions::GraphBuilder::atomParentheticalAssertionBegin):
+ (WebCore::ContentExtensions::GraphBuilder::disjunction):
+ (WebCore::ContentExtensions::GraphBuilder::hasError):
+ (WebCore::ContentExtensions::GraphBuilder::fail):
+ (WebCore::ContentExtensions::GraphBuilder::sinkFloatingTermIfNecessary):
+ (WebCore::ContentExtensions::URLFilterParser::addPattern):
+ (WebCore::ContentExtensions::URLFilterParser::statusString):
+ (WebCore::ContentExtensions::GraphBuilder::errorMessage): Deleted.
+ * contentextensions/URLFilterParser.h:
+ Use an enum instead of strings for the status to avoid checking strings when we have a regex that matches everything.
+
</ins><span class="cx"> 2015-03-18 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Fix build failure due to FALLTHROUGH in unreachable code
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -993,7 +993,7 @@
</span><span class="cx"> 24F54EAD101FE914000AE741 /* ApplicationCacheHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2542F4DA1166C25A00E89A86 /* UserGestureIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2542F4D81166C25A00E89A86 /* UserGestureIndicator.cpp */; };
</span><span class="cx"> 2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 262391361A648CEE007251A3 /* ContentExtensionsDebugging.h in Headers */ = {isa = PBXBuildFile; fileRef = 262391351A648CEE007251A3 /* ContentExtensionsDebugging.h */; };
</del><ins>+ 262391361A648CEE007251A3 /* ContentExtensionsDebugging.h in Headers */ = {isa = PBXBuildFile; fileRef = 262391351A648CEE007251A3 /* ContentExtensionsDebugging.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 26255F0018878DFF0006E1FD /* UserAgentIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26255EFF18878DFF0006E1FD /* UserAgentIOS.mm */; };
</span><span class="cx"> 26255F0318878E110006E1FD /* UserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 26255F0118878E110006E1FD /* UserAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 26255F0418878E110006E1FD /* UserAgentMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26255F0218878E110006E1FD /* UserAgentMac.mm */; };
</span><span class="lines">@@ -1008,10 +1008,10 @@
</span><span class="cx"> 267726001A5B3AD9003C24DD /* NFAToDFA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 267725FA1A5B3AD9003C24DD /* NFAToDFA.cpp */; };
</span><span class="cx"> 267726011A5B3AD9003C24DD /* NFAToDFA.h in Headers */ = {isa = PBXBuildFile; fileRef = 267725FB1A5B3AD9003C24DD /* NFAToDFA.h */; };
</span><span class="cx"> 267726041A5DF6F2003C24DD /* URLFilterParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 267726021A5DF6F2003C24DD /* URLFilterParser.cpp */; };
</span><del>- 267726051A5DF6F2003C24DD /* URLFilterParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 267726031A5DF6F2003C24DD /* URLFilterParser.h */; };
</del><ins>+ 267726051A5DF6F2003C24DD /* URLFilterParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 267726031A5DF6F2003C24DD /* URLFilterParser.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 269239961505E1AA009E57FC /* JSIDBVersionChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 269239921505E1AA009E57FC /* JSIDBVersionChangeEvent.h */; };
</span><del>- 269397221A4A412F00E8349D /* NFANode.h in Headers */ = {isa = PBXBuildFile; fileRef = 269397201A4A412F00E8349D /* NFANode.h */; };
- 269397241A4A5B6400E8349D /* NFA.h in Headers */ = {isa = PBXBuildFile; fileRef = 269397231A4A5B6400E8349D /* NFA.h */; };
</del><ins>+ 269397221A4A412F00E8349D /* NFANode.h in Headers */ = {isa = PBXBuildFile; fileRef = 269397201A4A412F00E8349D /* NFANode.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 269397241A4A5B6400E8349D /* NFA.h in Headers */ = {isa = PBXBuildFile; fileRef = 269397231A4A5B6400E8349D /* NFA.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 269397261A4A5FBD00E8349D /* NFA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 269397251A4A5FBD00E8349D /* NFA.cpp */; };
</span><span class="cx"> 26AA0F9E18D2A18B00419381 /* SelectorPseudoElementTypeMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26AA0F9D18D2A18B00419381 /* SelectorPseudoElementTypeMap.cpp */; };
</span><span class="cx"> 26B9998F1803AE7200D01121 /* RegisterAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B9998E1803AE7200D01121 /* RegisterAllocator.h */; };
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsCompiledContentExtensioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/CompiledContentExtension.cpp (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/CompiledContentExtension.cpp 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/CompiledContentExtension.cpp 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CompiledContentExtension.h"
</span><ins>+#include "DFABytecodeInterpreter.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx">
</span><span class="lines">@@ -35,6 +36,24 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<String> CompiledContentExtension::globalDisplayNoneSelectors()
+{
+ DFABytecodeInterpreter interpreter(bytecode(), bytecodeLength());
+ DFABytecodeInterpreter::Actions actionLocations = interpreter.actionsFromDFARoot();
+
+ Vector<Action> globalActions;
+ for (uint64_t actionLocation : actionLocations)
+ globalActions.append(Action::deserialize(actions(), actionsLength(), static_cast<unsigned>(actionLocation)));
+
+ Vector<String> selectors;
+ for (Action& action : globalActions) {
+ if (action.cssSelector().length())
+ selectors.append(action.cssSelector());
+ }
+
+ return selectors;
+}
+
</ins><span class="cx"> } // namespace ContentExtensions
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsCompiledContentExtensionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/CompiledContentExtension.h (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/CompiledContentExtension.h 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/CompiledContentExtension.h 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> virtual unsigned bytecodeLength() const = 0;
</span><span class="cx"> virtual const SerializedActionByte* actions() const = 0;
</span><span class="cx"> virtual unsigned actionsLength() const = 0;
</span><ins>+ Vector<String> globalDisplayNoneSelectors();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace ContentExtensions
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -108,19 +108,29 @@
</span><span class="cx">
</span><span class="cx"> Vector<SerializedActionByte> actions;
</span><span class="cx"> Vector<unsigned> actionLocations = serializeActions(parsedRuleList, actions);
</span><ins>+ Vector<uint64_t> universalActionLocations;
</ins><span class="cx">
</span><span class="cx"> NFA nfa;
</span><span class="cx"> URLFilterParser urlFilterParser(nfa);
</span><ins>+ bool nonUniversalActionSeen = false;
</ins><span class="cx"> for (unsigned ruleIndex = 0; ruleIndex < parsedRuleList.size(); ++ruleIndex) {
</span><span class="cx"> const ContentExtensionRule& contentExtensionRule = parsedRuleList[ruleIndex];
</span><span class="cx"> const Trigger& trigger = contentExtensionRule.trigger();
</span><span class="cx"> ASSERT(trigger.urlFilter.length());
</span><span class="cx">
</span><span class="cx"> // High bits are used for flags. This should match how they are used in DFABytecodeCompiler::compileNode.
</span><del>- String error = urlFilterParser.addPattern(trigger.urlFilter, trigger.urlFilterIsCaseSensitive, (static_cast<uint64_t>(trigger.flags) << 32) | static_cast<uint64_t>(actionLocations[ruleIndex]));
</del><ins>+ uint64_t actionLocationAndFlags =(static_cast<uint64_t>(trigger.flags) << 32) | static_cast<uint64_t>(actionLocations[ruleIndex]);
+ URLFilterParser::ParseStatus status = urlFilterParser.addPattern(trigger.urlFilter, trigger.urlFilterIsCaseSensitive, actionLocationAndFlags);
</ins><span class="cx">
</span><del>- if (!error.isNull()) {
- dataLogF("Error while parsing %s: %s\n", trigger.urlFilter.utf8().data(), error.utf8().data());
</del><ins>+ if (status == URLFilterParser::MatchesEverything) {
+ if (nonUniversalActionSeen)
+ dataLogF("Trigger matching everything found not at beginning. This may cause incorrect behavior with ignore-previous-rules");
+ universalActionLocations.append(actionLocationAndFlags);
+ } else
+ nonUniversalActionSeen = true;
+
+ if (status != URLFilterParser::Ok && status != URLFilterParser::MatchesEverything) {
+ dataLogF("Error while parsing %s: %s\n", trigger.urlFilter.utf8().data(), URLFilterParser::statusString(status).utf8().data());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -138,7 +148,9 @@
</span><span class="cx"> double dfaBuildTimeStart = monotonicallyIncreasingTime();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- const DFA dfa = NFAToDFA::convert(nfa);
</del><ins>+ DFA dfa = NFAToDFA::convert(nfa);
+ for (uint64_t actionLocation : universalActionLocations)
+ dfa.nodeAt(dfa.root()).actions.append(actionLocation);
</ins><span class="cx">
</span><span class="cx"> #if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING
</span><span class="cx"> double dfaBuildTimeEnd = monotonicallyIncreasingTime();
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFA.h (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFA.h 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/DFA.h 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> unsigned root() const { return m_root; }
</span><span class="cx"> unsigned size() const { return m_nodes.size(); }
</span><span class="cx"> const DFANode& nodeAt(unsigned i) const { return m_nodes[i]; }
</span><ins>+ DFANode& nodeAt(unsigned i) { return m_nodes[i]; }
</ins><span class="cx">
</span><span class="cx"> #if CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING
</span><span class="cx"> void debugPrintDot() const;
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFABytecodeInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -40,7 +40,18 @@
</span><span class="cx"> ASSERT_UNUSED(bytecodeLength, index + sizeof(IntType) <= bytecodeLength);
</span><span class="cx"> return *reinterpret_cast<const IntType*>(&bytecode[index]);
</span><span class="cx"> }
</span><del>-
</del><ins>+
+DFABytecodeInterpreter::Actions DFABytecodeInterpreter::actionsFromDFARoot()
+{
+ unsigned programCounter = 0;
+ DFABytecodeInterpreter::Actions globalActionLocations;
+ while (static_cast<DFABytecodeInstruction>(m_bytecode[programCounter]) == DFABytecodeInstruction::AppendAction) {
+ globalActionLocations.add(static_cast<uint64_t>(getBits<unsigned>(m_bytecode, m_bytecodeLength, programCounter + sizeof(DFABytecode))));
+ programCounter += instructionSizeWithArguments(DFABytecodeInstruction::AppendAction);
+ }
+ return globalActionLocations;
+}
+
</ins><span class="cx"> DFABytecodeInterpreter::Actions DFABytecodeInterpreter::interpret(const CString& urlCString, uint16_t flags)
</span><span class="cx"> {
</span><span class="cx"> const char* url = urlCString.data();
</span><span class="lines">@@ -51,6 +62,8 @@
</span><span class="cx"> bool urlIndexIsAfterEndOfString = false;
</span><span class="cx"> Actions actions;
</span><span class="cx">
</span><ins>+ // FIXME: Skip the actions from the root once they are used through actionsFromDFARoot. Change AppendAction to AppendActions to make this faster.
+
</ins><span class="cx"> // This should always terminate if interpreting correctly compiled bytecode.
</span><span class="cx"> while (true) {
</span><span class="cx"> ASSERT(programCounter <= m_bytecodeLength);
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFABytecodeInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.h (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.h 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.h 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> typedef HashSet<uint64_t, DefaultHash<uint64_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>> Actions;
</span><span class="cx">
</span><span class="cx"> Actions interpret(const CString&, uint16_t flags);
</span><ins>+ Actions actionsFromDFARoot();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> const DFABytecode* m_bytecode;
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsNFAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/NFA.h (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/NFA.h 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/NFA.h 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> // The nodes are accessed through an identifier.
</span><span class="cx"> class NFA {
</span><span class="cx"> public:
</span><del>- NFA();
</del><ins>+ WEBCORE_EXPORT NFA();
</ins><span class="cx"> unsigned root() const { return m_root; }
</span><span class="cx"> unsigned createNode();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsURLFilterParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/URLFilterParser.cpp (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/URLFilterParser.cpp 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/URLFilterParser.cpp 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <JavaScriptCore/YarrParser.h>
</span><span class="cx"> #include <wtf/BitVector.h>
</span><span class="cx"> #include <wtf/Deque.h>
</span><ins>+#include <wtf/text/CString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -174,6 +175,7 @@
</span><span class="cx"> ASSERT_WITH_MESSAGE(m_quantifier == AtomQuantifier::One, "Transition to quantified term should only happen once.");
</span><span class="cx"> m_quantifier = quantifier;
</span><span class="cx"> }
</span><ins>+ AtomQuantifier quantifier() const { return m_quantifier; }
</ins><span class="cx">
</span><span class="cx"> unsigned generateGraph(NFA& nfa, uint64_t patternId, unsigned start) const
</span><span class="cx"> {
</span><span class="lines">@@ -428,6 +430,7 @@
</span><span class="cx"> , m_subtreeStart(nfa.root())
</span><span class="cx"> , m_subtreeEnd(nfa.root())
</span><span class="cx"> , m_lastPrefixTreeEntry(&prefixTreeRoot)
</span><ins>+ , m_parseStatus(URLFilterParser::Ok)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -438,20 +441,56 @@
</span><span class="cx">
</span><span class="cx"> sinkFloatingTermIfNecessary();
</span><span class="cx">
</span><ins>+ // Check to see if there are any terms without ? or *.
+ bool matchesEverything = true;
+ for (const auto& term : m_sunkTerms) {
+ if (term.quantifier() == AtomQuantifier::One || term.quantifier() == AtomQuantifier::OneOrMore) {
+ matchesEverything = false;
+ break;
+ }
+ }
+ if (matchesEverything)
+ fail(URLFilterParser::MatchesEverything);
+
+ for (const auto& term : m_sunkTerms) {
+ ASSERT(m_lastPrefixTreeEntry);
+ auto nextEntry = m_lastPrefixTreeEntry->nextPattern.find(term);
+ if (nextEntry != m_lastPrefixTreeEntry->nextPattern.end()) {
+ m_lastPrefixTreeEntry = nextEntry->value.get();
+ m_nfa.addRuleId(m_lastPrefixTreeEntry->nfaNode, m_patternId);
+ } else {
+ std::unique_ptr<PrefixTreeEntry> nextPrefixTreeEntry = std::make_unique<PrefixTreeEntry>();
+
+ unsigned newEnd = term.generateGraph(m_nfa, m_patternId, m_lastPrefixTreeEntry->nfaNode);
+ nextPrefixTreeEntry->nfaNode = newEnd;
+
+ auto addResult = m_lastPrefixTreeEntry->nextPattern.set(term, WTF::move(nextPrefixTreeEntry));
+ ASSERT(addResult.isNewEntry);
+
+ if (!m_newPrefixSubtreeRoot) {
+ m_newPrefixSubtreeRoot = m_lastPrefixTreeEntry;
+ m_newPrefixStaringPoint = term;
+ }
+
+ m_lastPrefixTreeEntry = addResult.iterator->value.get();
+ }
+ m_subtreeEnd = m_lastPrefixTreeEntry->nfaNode;
+ }
+
</ins><span class="cx"> if (!m_openGroups.isEmpty()) {
</span><del>- fail(ASCIILiteral("The expression has unclosed groups."));
</del><ins>+ fail(URLFilterParser::UnclosedGroups);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_subtreeStart != m_subtreeEnd)
</span><span class="cx"> m_nfa.setFinal(m_subtreeEnd, m_patternId);
</span><span class="cx"> else
</span><del>- fail(ASCIILiteral("The pattern cannot match anything."));
</del><ins>+ fail(URLFilterParser::CannotMatchAnything);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- const String& errorMessage() const
</del><ins>+ URLFilterParser::ParseStatus parseStatus() const
</ins><span class="cx"> {
</span><del>- return m_errorMessage;
</del><ins>+ return m_parseStatus;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void atomPatternCharacter(UChar character)
</span><span class="lines">@@ -460,7 +499,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!isASCII(character)) {
</span><del>- fail(ASCIILiteral("Only ASCII characters are supported in pattern."));
</del><ins>+ fail(URLFilterParser::NonASCII);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -482,7 +521,7 @@
</span><span class="cx"> if (builtInCharacterClassID == JSC::Yarr::NewlineClassID && inverted)
</span><span class="cx"> m_floatingTerm = Term(Term::UniversalTransition);
</span><span class="cx"> else
</span><del>- fail(ASCIILiteral("Character class is not supported."));
</del><ins>+ fail(URLFilterParser::UnsupportedCharacterClass);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void quantifyAtom(unsigned minimum, unsigned maximum, bool)
</span><span class="lines">@@ -491,7 +530,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_floatingTerm.isValid())
</span><del>- fail(ASCIILiteral("Quantifier without corresponding term to quantify."));
</del><ins>+ fail(URLFilterParser::MisplacedQuantifier);
</ins><span class="cx">
</span><span class="cx"> if (!minimum && maximum == 1)
</span><span class="cx"> m_floatingTerm.quantify(AtomQuantifier::ZeroOrOne);
</span><span class="lines">@@ -500,12 +539,12 @@
</span><span class="cx"> else if (minimum == 1 && maximum == JSC::Yarr::quantifyInfinite)
</span><span class="cx"> m_floatingTerm.quantify(AtomQuantifier::OneOrMore);
</span><span class="cx"> else
</span><del>- fail(ASCIILiteral("Arbitrary atom repetitions are not supported."));
</del><ins>+ fail(URLFilterParser::InvalidQuantifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void atomBackReference(unsigned)
</span><span class="cx"> {
</span><del>- fail(ASCIILiteral("Patterns cannot contain backreferences."));
</del><ins>+ fail(URLFilterParser::BackReference);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void assertionBOL()
</span><span class="lines">@@ -514,7 +553,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_subtreeStart != m_subtreeEnd || m_floatingTerm.isValid() || !m_openGroups.isEmpty())
</span><del>- fail(ASCIILiteral("Start of line assertion can only appear as the first term in a filter."));
</del><ins>+ fail(URLFilterParser::MisplacedStartOfLine);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void assertionEOL()
</span><span class="lines">@@ -530,7 +569,7 @@
</span><span class="cx">
</span><span class="cx"> void assertionWordBoundary(bool)
</span><span class="cx"> {
</span><del>- fail(ASCIILiteral("Word boundaries assertions are not supported yet."));
</del><ins>+ fail(URLFilterParser::WordBoundary);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void atomCharacterClassBegin(bool inverted = false)
</span><span class="lines">@@ -549,10 +588,7 @@
</span><span class="cx"> if (hasError())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!isASCII(character)) {
- fail(ASCIILiteral("Non ASCII Character in a character set."));
- return;
- }
</del><ins>+ ASSERT(isASCII(character));
</ins><span class="cx">
</span><span class="cx"> m_floatingTerm.addCharacter(character, m_patternIsCaseSensitive);
</span><span class="cx"> }
</span><span class="lines">@@ -562,10 +598,10 @@
</span><span class="cx"> if (hasError())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!a || !b || !isASCII(a) || !isASCII(b)) {
- fail(ASCIILiteral("Non ASCII Character in a character range of a character set."));
- return;
- }
</del><ins>+ ASSERT(a);
+ ASSERT(b);
+ ASSERT(isASCII(a));
+ ASSERT(isASCII(b));
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = a; i <= b; ++i)
</span><span class="cx"> m_floatingTerm.addCharacter(static_cast<UChar>(i), m_patternIsCaseSensitive);
</span><span class="lines">@@ -578,7 +614,7 @@
</span><span class="cx">
</span><span class="cx"> void atomCharacterClassBuiltIn(JSC::Yarr::BuiltInCharacterClassID, bool)
</span><span class="cx"> {
</span><del>- fail(ASCIILiteral("Builtins character class atoms are not supported yet."));
</del><ins>+ fail(URLFilterParser::AtomCharacter);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void atomParenthesesSubpatternBegin(bool = true)
</span><span class="lines">@@ -593,7 +629,7 @@
</span><span class="cx">
</span><span class="cx"> void atomParentheticalAssertionBegin(bool = false)
</span><span class="cx"> {
</span><del>- fail(ASCIILiteral("Groups are not supported yet."));
</del><ins>+ fail(URLFilterParser::Group);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void atomParenthesesEnd()
</span><span class="lines">@@ -609,16 +645,16 @@
</span><span class="cx">
</span><span class="cx"> void disjunction()
</span><span class="cx"> {
</span><del>- fail(ASCIILiteral("Disjunctions are not supported yet."));
</del><ins>+ fail(URLFilterParser::Disjunction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool hasError() const
</span><span class="cx"> {
</span><del>- return !m_errorMessage.isNull();
</del><ins>+ return m_parseStatus != URLFilterParser::Ok;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void fail(const String& errorMessage)
</del><ins>+ void fail(URLFilterParser::ParseStatus reason)
</ins><span class="cx"> {
</span><span class="cx"> if (hasError())
</span><span class="cx"> return;
</span><span class="lines">@@ -626,7 +662,7 @@
</span><span class="cx"> if (m_newPrefixSubtreeRoot)
</span><span class="cx"> m_newPrefixSubtreeRoot->nextPattern.remove(m_newPrefixStaringPoint);
</span><span class="cx">
</span><del>- m_errorMessage = errorMessage;
</del><ins>+ m_parseStatus = reason;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void sinkFloatingTermIfNecessary()
</span><span class="lines">@@ -634,10 +670,8 @@
</span><span class="cx"> if (!m_floatingTerm.isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(m_lastPrefixTreeEntry);
-
</del><span class="cx"> if (m_hasProcessedEndOfLineAssertion) {
</span><del>- fail(ASCIILiteral("The end of line assertion must be the last term in an expression."));
</del><ins>+ fail(URLFilterParser::MisplacedEndOfLine);
</ins><span class="cx"> m_floatingTerm = Term();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -651,30 +685,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto nextEntry = m_lastPrefixTreeEntry->nextPattern.find(m_floatingTerm);
- if (nextEntry != m_lastPrefixTreeEntry->nextPattern.end()) {
- m_lastPrefixTreeEntry = nextEntry->value.get();
- m_nfa.addRuleId(m_lastPrefixTreeEntry->nfaNode, m_patternId);
- } else {
- std::unique_ptr<PrefixTreeEntry> nextPrefixTreeEntry = std::make_unique<PrefixTreeEntry>();
-
- unsigned newEnd = m_floatingTerm.generateGraph(m_nfa, m_patternId, m_lastPrefixTreeEntry->nfaNode);
- nextPrefixTreeEntry->nfaNode = newEnd;
-
- auto addResult = m_lastPrefixTreeEntry->nextPattern.set(m_floatingTerm, WTF::move(nextPrefixTreeEntry));
- ASSERT(addResult.isNewEntry);
-
- if (!m_newPrefixSubtreeRoot) {
- m_newPrefixSubtreeRoot = m_lastPrefixTreeEntry;
- m_newPrefixStaringPoint = m_floatingTerm;
- }
-
- m_lastPrefixTreeEntry = addResult.iterator->value.get();
- }
- m_subtreeEnd = m_lastPrefixTreeEntry->nfaNode;
-
</del><ins>+ m_sunkTerms.append(m_floatingTerm);
</ins><span class="cx"> m_floatingTerm = Term();
</span><del>- ASSERT(m_lastPrefixTreeEntry);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NFA& m_nfa;
</span><span class="lines">@@ -686,13 +698,14 @@
</span><span class="cx">
</span><span class="cx"> PrefixTreeEntry* m_lastPrefixTreeEntry;
</span><span class="cx"> Deque<Term> m_openGroups;
</span><ins>+ Vector<Term> m_sunkTerms;
</ins><span class="cx"> Term m_floatingTerm;
</span><span class="cx"> bool m_hasProcessedEndOfLineAssertion { false };
</span><span class="cx">
</span><span class="cx"> PrefixTreeEntry* m_newPrefixSubtreeRoot = nullptr;
</span><span class="cx"> Term m_newPrefixStaringPoint;
</span><span class="cx">
</span><del>- String m_errorMessage;
</del><ins>+ URLFilterParser::ParseStatus m_parseStatus;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> URLFilterParser::URLFilterParser(NFA& nfa)
</span><span class="lines">@@ -706,33 +719,74 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String URLFilterParser::addPattern(const String& pattern, bool patternIsCaseSensitive, uint64_t patternId)
</del><ins>+URLFilterParser::ParseStatus URLFilterParser::addPattern(const String& pattern, bool patternIsCaseSensitive, uint64_t patternId)
</ins><span class="cx"> {
</span><span class="cx"> if (!pattern.containsOnlyASCII())
</span><del>- return ASCIILiteral("URLFilterParser only supports ASCII patterns.");
</del><ins>+ return NonASCII;
</ins><span class="cx"> ASSERT(!pattern.isEmpty());
</span><span class="cx">
</span><span class="cx"> if (pattern.isEmpty())
</span><del>- return ASCIILiteral("Empty pattern.");
</del><ins>+ return EmptyPattern;
</ins><span class="cx">
</span><span class="cx"> unsigned oldSize = m_nfa.graphSize();
</span><span class="cx">
</span><del>- String error;
-
</del><ins>+ ParseStatus status = Ok;
</ins><span class="cx"> GraphBuilder graphBuilder(m_nfa, *m_prefixTreeRoot, patternIsCaseSensitive, patternId);
</span><del>- error = String(JSC::Yarr::parse(graphBuilder, pattern, 0));
</del><ins>+ String error = String(JSC::Yarr::parse(graphBuilder, pattern, 0));
</ins><span class="cx"> if (error.isNull())
</span><span class="cx"> graphBuilder.finalize();
</span><ins>+ else
+ status = YarrError;
+
+ if (status == Ok)
+ status = graphBuilder.parseStatus();
</ins><span class="cx">
</span><del>- if (error.isNull())
- error = graphBuilder.errorMessage();
-
- if (!error.isNull())
</del><ins>+ if (status != Ok)
</ins><span class="cx"> m_nfa.restoreToGraphSize(oldSize);
</span><span class="cx">
</span><del>- return error;
</del><ins>+ return status;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+String URLFilterParser::statusString(ParseStatus status)
+{
+ switch (status) {
+ case Ok:
+ return "Ok";
+ case MatchesEverything:
+ return "Matches everything.";
+ case UnclosedGroups:
+ return "The expression has unclosed groups.";
+ case CannotMatchAnything:
+ return "The pattern cannot match anything.";
+ case NonASCII:
+ return "Only ASCII characters are supported in pattern.";
+ case UnsupportedCharacterClass:
+ return "Character class is not supported.";
+ case MisplacedQuantifier:
+ return "Quantifier without corresponding term to quantify.";
+ case BackReference:
+ return "Patterns cannot contain backreferences.";
+ case MisplacedStartOfLine:
+ return "Start of line assertion can only appear as the first term in a filter.";
+ case WordBoundary:
+ return "Word boundaries assertions are not supported yet.";
+ case AtomCharacter:
+ return "Builtins character class atoms are not supported yet.";
+ case Group:
+ return "Groups are not supported yet.";
+ case Disjunction:
+ return "Disjunctions are not supported yet.";
+ case MisplacedEndOfLine:
+ return "The end of line assertion must be the last term in an expression.";
+ case EmptyPattern:
+ return "Empty pattern.";
+ case YarrError:
+ return "Internal error in YARR.";
+ case InvalidQuantifier:
+ return "Arbitrary atom repetitions are not supported.";
+ }
+}
+
</ins><span class="cx"> } // namespace ContentExtensions
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsURLFilterParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/URLFilterParser.h (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/URLFilterParser.h 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Source/WebCore/contentextensions/URLFilterParser.h 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -39,11 +39,31 @@
</span><span class="cx">
</span><span class="cx"> struct PrefixTreeEntry;
</span><span class="cx">
</span><del>-class URLFilterParser {
</del><ins>+class WEBCORE_EXPORT URLFilterParser {
</ins><span class="cx"> public:
</span><ins>+ enum ParseStatus {
+ Ok,
+ MatchesEverything,
+ UnclosedGroups,
+ CannotMatchAnything,
+ NonASCII,
+ UnsupportedCharacterClass,
+ MisplacedQuantifier,
+ BackReference,
+ MisplacedStartOfLine,
+ WordBoundary,
+ AtomCharacter,
+ Group,
+ Disjunction,
+ MisplacedEndOfLine,
+ EmptyPattern,
+ YarrError,
+ InvalidQuantifier,
+ };
+ static String statusString(ParseStatus);
</ins><span class="cx"> explicit URLFilterParser(NFA&);
</span><span class="cx"> ~URLFilterParser();
</span><del>- String addPattern(const String& pattern, bool patternIsCaseSensitive, uint64_t patternId);
</del><ins>+ ParseStatus 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>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Tools/ChangeLog 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-03-18 Alex Christensen <achristensen@webkit.org>
+
+ [ContentExtensions] Prepare for compiling stylesheets of selectors to be used on every page.
+ https://bugs.webkit.org/show_bug.cgi?id=142799
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (TestWebKitAPI::testPattern):
+ (TestWebKitAPI::TEST_F):
+ Start testing regex failures.
+
</ins><span class="cx"> 2015-03-18 Dhi Aurrahman <diorahman@rockybars.com>
</span><span class="cx">
</span><span class="cx"> Fix StringView typos after r181525 and r181558
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (181725 => 181726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-03-19 04:05:51 UTC (rev 181725)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-03-19 04:57:20 UTC (rev 181726)
</span><span class="lines">@@ -29,10 +29,13 @@
</span><span class="cx"> #include <JavaScriptCore/InitializeThreading.h>
</span><span class="cx"> #include <WebCore/ContentExtensionCompiler.h>
</span><span class="cx"> #include <WebCore/ContentExtensionsBackend.h>
</span><ins>+#include <WebCore/NFA.h>
</ins><span class="cx"> #include <WebCore/ResourceLoadInfo.h>
</span><span class="cx"> #include <WebCore/URL.h>
</span><ins>+#include <WebCore/URLFilterParser.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><ins>+#include <wtf/text/CString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace ContentExtensions {
</span><span class="lines">@@ -335,4 +338,19 @@
</span><span class="cx"> testRequest(backend, mainDocumentRequest("http://block_only_images.org", ResourceType::Document), { });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void testPatternStatus(const char* pattern, ContentExtensions::URLFilterParser::ParseStatus status)
+{
+ ContentExtensions::NFA nfa;
+ ContentExtensions::URLFilterParser parser(nfa);
+ EXPECT_EQ(status, parser.addPattern(ASCIILiteral(pattern), false, 0));
+}
+
+TEST_F(ContentExtensionTest, ParsingFailures)
+{
+ testPatternStatus("a*b?.*.?[a-z]?[a-z]*", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+ testPatternStatus("a*b?.*.?[a-z]?[a-z]+", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("a*b?.*.?[a-z]?[a-z]", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ // FIXME: Add regexes that cause each parse status.
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>