<!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>[199226] 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/199226">199226</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-04-08 09:04:24 -0700 (Fri, 08 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Quick Open fails to match pattern "bB" in file "abBc"
https://bugs.webkit.org/show_bug.cgi?id=156398
Reviewed by Timothy Hatcher.
Source/WebInspectorUI:
Correct an off-by-one error in the backtrack routine that set the dead
branch index to the character just before the match that was popped.
The dead branch index should equal the index of the popped match.
* UserInterface/Controllers/ResourceQueryController.js:
(WebInspector.ResourceQueryController.prototype._findQueryMatches.backtrack):
(WebInspector.ResourceQueryController.prototype._findQueryMatches):
LayoutTests:
* inspector/unit-tests/resource-query-controller-expected.txt:
* inspector/unit-tests/resource-query-controller.html:
Test that two repeated characters in the search string are correctly
matched when the first character is lowercase and the second is uppercase.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsresourcequerycontrollerexpectedtxt">trunk/LayoutTests/inspector/unit-tests/resource-query-controller-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsresourcequerycontrollerhtml">trunk/LayoutTests/inspector/unit-tests/resource-query-controller.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersResourceQueryControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/ResourceQueryController.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199225 => 199226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-08 14:45:24 UTC (rev 199225)
+++ trunk/LayoutTests/ChangeLog 2016-04-08 16:04:24 UTC (rev 199226)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-08 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Quick Open fails to match pattern "bB" in file "abBc"
+ https://bugs.webkit.org/show_bug.cgi?id=156398
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/unit-tests/resource-query-controller-expected.txt:
+ * inspector/unit-tests/resource-query-controller.html:
+ Test that two repeated characters in the search string are correctly
+ matched when the first character is lowercase and the second is uppercase.
+
</ins><span class="cx"> 2016-04-08 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Testharness-based tests that time out should be able to produce a detailled output
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsresourcequerycontrollerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/resource-query-controller-expected.txt (199225 => 199226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/resource-query-controller-expected.txt 2016-04-08 14:45:24 UTC (rev 199225)
+++ trunk/LayoutTests/inspector/unit-tests/resource-query-controller-expected.txt 2016-04-08 16:04:24 UTC (rev 199226)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> PASS: Query "abcde" should match "A B C De" in "AbcdBcdCdDe".
</span><span class="cx"> PASS: Query "abcdex" should match "A B C d ex" in "AxBxCxdxexDxyxEF".
</span><span class="cx"> PASS: Query "bc" should match " bC" in "abCd".
</span><ins>+PASS: Query "bb" should match " bB" in "abBc".
</ins><span class="cx">
</span><span class="cx"> -- Running test case: ExecuteQueryShouldIgnoreCase
</span><span class="cx"> All case permutations of query "abcd" should match "abcd" in "abcde".
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsresourcequerycontrollerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/resource-query-controller.html (199225 => 199226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/resource-query-controller.html 2016-04-08 14:45:24 UTC (rev 199225)
+++ trunk/LayoutTests/inspector/unit-tests/resource-query-controller.html 2016-04-08 16:04:24 UTC (rev 199226)
</span><span class="lines">@@ -179,6 +179,11 @@
</span><span class="cx"> filename: "abCd",
</span><span class="cx"> expected: " bC"
</span><span class="cx"> },
</span><ins>+ {
+ query: "bb",
+ filename: "abBc",
+ expected: " bB"
+ }
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> for (let {query, filename, expected} of tests) {
</span><span class="lines">@@ -187,7 +192,7 @@
</span><span class="cx">
</span><span class="cx"> let results = matcher.executeQuery(query);
</span><span class="cx"> InspectorTest.assert(results.length === 1, "Should return exactly one match.");
</span><del>- let actual = results[0].__test_createMatchesMask();
</del><ins>+ let actual = results.length ? results[0].__test_createMatchesMask() : null;
</ins><span class="cx"> InspectorTest.expectThat(actual === expected, `Query "${query}" should match "${expected}" in "${filename}".`);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199225 => 199226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-08 14:45:24 UTC (rev 199225)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-08 16:04:24 UTC (rev 199226)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-04-08 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Quick Open fails to match pattern "bB" in file "abBc"
+ https://bugs.webkit.org/show_bug.cgi?id=156398
+
+ Reviewed by Timothy Hatcher.
+
+ Correct an off-by-one error in the backtrack routine that set the dead
+ branch index to the character just before the match that was popped.
+ The dead branch index should equal the index of the popped match.
+
+ * UserInterface/Controllers/ResourceQueryController.js:
+ (WebInspector.ResourceQueryController.prototype._findQueryMatches.backtrack):
+ (WebInspector.ResourceQueryController.prototype._findQueryMatches):
+
</ins><span class="cx"> 2016-04-07 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: OpenResourceDialog should keep its resources list up-to-date
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersResourceQueryControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ResourceQueryController.js (199225 => 199226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ResourceQueryController.js 2016-04-08 14:45:24 UTC (rev 199225)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ResourceQueryController.js 2016-04-08 16:04:24 UTC (rev 199226)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> if (lastMatch.type !== WebInspector.ResourceQueryMatch.Type.Special)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- deadBranches[lastMatch.queryIndex] = lastMatch.index - 1;
</del><ins>+ deadBranches[lastMatch.queryIndex] = lastMatch.index;
</ins><span class="cx"> searchIndex = matches.lastValue ? matches.lastValue.index + 1 : 0;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>