<!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>[214683] 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/214683">214683</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-03-31 12:56:30 -0700 (Fri, 31 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mail can get stuck underneath FindController::findStringMatches after searching in a long message
https://bugs.webkit.org/show_bug.cgi?id=170326
<rdar://problem/30330395>
Reviewed by Simon Fraser.
Source/WebKit2:
* UIProcess/mac/WKTextFinderClient.mm:
(-[WKTextFinderClient findMatchesForString:relativeToMatch:findOptions:maxResults:resultCollector:]):
Cap the number of find matches at 1000, the same maximum that Safari uses.
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm:
(TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKTextFinderClientmm">trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaFindInPagemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (214682 => 214683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-31 19:42:07 UTC (rev 214682)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-31 19:56:30 UTC (rev 214683)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-31 Tim Horton <timothy_horton@apple.com>
+
+ Mail can get stuck underneath FindController::findStringMatches after searching in a long message
+ https://bugs.webkit.org/show_bug.cgi?id=170326
+ <rdar://problem/30330395>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/mac/WKTextFinderClient.mm:
+ (-[WKTextFinderClient findMatchesForString:relativeToMatch:findOptions:maxResults:resultCollector:]):
+ Cap the number of find matches at 1000, the same maximum that Safari uses.
+
</ins><span class="cx"> 2017-03-31 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up the "StorageType" enum.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKTextFinderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm (214682 => 214683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm 2017-03-31 19:42:07 UTC (rev 214682)
+++ trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm 2017-03-31 19:56:30 UTC (rev 214683)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "WebImage.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import <WebCore/NSTextFinderSPI.h>
</span><ins>+#import <algorithm>
</ins><span class="cx"> #import <wtf/Deque.h>
</span><span class="cx">
</span><span class="cx"> // FIXME: Implement support for replace.
</span><span class="lines">@@ -42,6 +43,8 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><ins>+static const NSUInteger maximumFindMatches = 1000;
+
</ins><span class="cx"> @interface WKTextFinderClient ()
</span><span class="cx">
</span><span class="cx"> - (void)didFindStringMatchesWithRects:(const Vector<Vector<IntRect>>&)rects;
</span><span class="lines">@@ -172,6 +175,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)findMatchesForString:(NSString *)targetString relativeToMatch:(id <NSTextFinderAsynchronousDocumentFindMatch>)relativeMatch findOptions:(NSTextFinderAsynchronousDocumentFindOptions)findOptions maxResults:(NSUInteger)maxResults resultCollector:(void (^)(NSArray *matches, BOOL didWrap))resultCollector
</span><span class="cx"> {
</span><ins>+ // Limit the number of results, for performance reasons; NSTextFinder always
+ // passes either 1 or NSUIntegerMax, which results in search time being
+ // proportional to document length.
+ maxResults = std::min(maxResults, maximumFindMatches);
+
</ins><span class="cx"> unsigned kitFindOptions = 0;
</span><span class="cx">
</span><span class="cx"> if (findOptions & NSTextFinderAsynchronousDocumentFindOptionsBackwards)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214682 => 214683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-31 19:42:07 UTC (rev 214682)
+++ trunk/Tools/ChangeLog 2017-03-31 19:56:30 UTC (rev 214683)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-31 Tim Horton <timothy_horton@apple.com>
+
+ Mail can get stuck underneath FindController::findStringMatches after searching in a long message
+ https://bugs.webkit.org/show_bug.cgi?id=170326
+ <rdar://problem/30330395>
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm:
+ (TEST):
+
</ins><span class="cx"> 2017-03-31 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix WTR crashes in GTK+ port after r214413.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaFindInPagemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm (214682 => 214683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm 2017-03-31 19:42:07 UTC (rev 214682)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm 2017-03-31 19:56:30 UTC (rev 214683)
</span><span class="lines">@@ -123,6 +123,15 @@
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&findMatchesDone);
</span><span class="cx"> findMatchesDone = false;
</span><ins>+
+ // Ensure that we cap the number of matches. There are actually 1600, but we only get the first 1000.
+ [webView findMatchesForString:@" " relativeToMatch:nil findOptions:noFindOptions maxResults:NSUIntegerMax resultCollector:^(NSArray *matches, BOOL didWrap) {
+ EXPECT_EQ((NSUInteger)1000, matches.count);
+
+ findMatchesDone = true;
+ }];
+ TestWebKitAPI::Util::run(&findMatchesDone);
+ findMatchesDone = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>