<!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>[170012] trunk/Source</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/170012">170012</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-06-16 09:42:31 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Page::findStringMatchingRanges() should take Vector<RefPtr<Range>> by reference instead of pointer
https://bugs.webkit.org/show_bug.cgi?id=133677
Reviewed by Anders Carlsson.
Source/WebCore:
* WebCore.exp.in: Update the changed symbol.
* page/Page.cpp:
(WebCore::Page::findStringMatchingRanges): The method expects the matchRanges parameter to be non-null,
so it should take in that parameter by reference instead of pointer.
* page/Page.h:
Source/WebKit2:
* WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::findString): Update the call to Page::findStringMatchingRanges() to pass
in a Vector<RefPtr<Range>> reference instead of a pointer.
(WebKit::FindController::findStringMatches): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageFindControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170011 => 170012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-16 16:40:56 UTC (rev 170011)
+++ trunk/Source/WebCore/ChangeLog 2014-06-16 16:42:31 UTC (rev 170012)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-16 Zan Dobersek <zdobersek@igalia.com>
+
+ Page::findStringMatchingRanges() should take Vector<RefPtr<Range>> by reference instead of pointer
+ https://bugs.webkit.org/show_bug.cgi?id=133677
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.exp.in: Update the changed symbol.
+ * page/Page.cpp:
+ (WebCore::Page::findStringMatchingRanges): The method expects the matchRanges parameter to be non-null,
+ so it should take in that parameter by reference instead of pointer.
+ * page/Page.h:
+
</ins><span class="cx"> 2014-06-16 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r168046): Incorrect layout for multicol spanners when moving from one thread to another
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (170011 => 170012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-16 16:40:56 UTC (rev 170011)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-16 16:42:31 UTC (rev 170012)
</span><span class="lines">@@ -1108,7 +1108,7 @@
</span><span class="cx"> __ZN7WebCore4Page22removeLayoutMilestonesEj
</span><span class="cx"> __ZN7WebCore4Page23clearUndoRedoOperationsEv
</span><span class="cx"> __ZN7WebCore4Page23invalidateStylesForLinkEy
</span><del>-__ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEhiPNS1_6VectorINS1_6RefPtrINS_5RangeEEELm0ENS1_15CrashOnOverflowEEERi
</del><ins>+__ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEhiRNS1_6VectorINS1_6RefPtrINS_5RangeEEELm0ENS1_15CrashOnOverflowEEERi
</ins><span class="cx"> __ZN7WebCore4Page24resumeScriptedAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page24scrollingStateTreeAsTextEv
</span><span class="cx"> __ZN7WebCore4Page25suspendScriptedAnimationsEv
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (170011 => 170012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-06-16 16:40:56 UTC (rev 170011)
+++ trunk/Source/WebCore/page/Page.cpp 2014-06-16 16:42:31 UTC (rev 170012)
</span><span class="lines">@@ -539,35 +539,35 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::findStringMatchingRanges(const String& target, FindOptions options, int limit, Vector<RefPtr<Range>>* matchRanges, int& indexForSelection)
</del><ins>+void Page::findStringMatchingRanges(const String& target, FindOptions options, int limit, Vector<RefPtr<Range>>& matchRanges, int& indexForSelection)
</ins><span class="cx"> {
</span><span class="cx"> indexForSelection = 0;
</span><span class="cx">
</span><span class="cx"> Frame* frame = &mainFrame();
</span><span class="cx"> Frame* frameWithSelection = 0;
</span><span class="cx"> do {
</span><del>- frame->editor().countMatchesForText(target, 0, options, limit ? (limit - matchRanges->size()) : 0, true, matchRanges);
</del><ins>+ frame->editor().countMatchesForText(target, 0, options, limit ? (limit - matchRanges.size()) : 0, true, &matchRanges);
</ins><span class="cx"> if (frame->selection().isRange())
</span><span class="cx"> frameWithSelection = frame;
</span><span class="cx"> frame = incrementFrame(frame, true, false);
</span><span class="cx"> } while (frame);
</span><span class="cx">
</span><del>- if (matchRanges->isEmpty())
</del><ins>+ if (matchRanges.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (frameWithSelection) {
</span><span class="cx"> indexForSelection = NoMatchAfterUserSelection;
</span><span class="cx"> RefPtr<Range> selectedRange = frameWithSelection->selection().selection().firstRange();
</span><span class="cx"> if (options & Backwards) {
</span><del>- for (size_t i = matchRanges->size(); i > 0; --i) {
- if (selectedRange->compareBoundaryPoints(Range::END_TO_START, matchRanges->at(i - 1).get(), IGNORE_EXCEPTION) > 0) {
</del><ins>+ for (size_t i = matchRanges.size(); i > 0; --i) {
+ if (selectedRange->compareBoundaryPoints(Range::END_TO_START, matchRanges[i - 1].get(), IGNORE_EXCEPTION) > 0) {
</ins><span class="cx"> indexForSelection = i - 1;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- for (size_t i = 0; i < matchRanges->size(); ++i) {
- if (selectedRange->compareBoundaryPoints(Range::START_TO_END, matchRanges->at(i).get(), IGNORE_EXCEPTION) < 0) {
</del><ins>+ for (size_t i = 0, size = matchRanges.size(); i < size; ++i) {
+ if (selectedRange->compareBoundaryPoints(Range::START_TO_END, matchRanges[i].get(), IGNORE_EXCEPTION) < 0) {
</ins><span class="cx"> indexForSelection = i;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (options & Backwards)
</span><del>- indexForSelection = matchRanges->size() - 1;
</del><ins>+ indexForSelection = matchRanges.size() - 1;
</ins><span class="cx"> else
</span><span class="cx"> indexForSelection = 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (170011 => 170012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-06-16 16:40:56 UTC (rev 170011)
+++ trunk/Source/WebCore/page/Page.h 2014-06-16 16:42:31 UTC (rev 170012)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> // the index of the first range after the user selection
</span><span class="cx"> // NoMatchAfterUserSelection if there is no matching text after the user selection.
</span><span class="cx"> enum { NoMatchAfterUserSelection = -1 };
</span><del>- void findStringMatchingRanges(const String&, FindOptions, int maxCount, Vector<RefPtr<Range>>*, int& indexForSelection);
</del><ins>+ void findStringMatchingRanges(const String&, FindOptions, int maxCount, Vector<RefPtr<Range>>&, int& indexForSelection);
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void addSchedulePair(PassRefPtr<SchedulePair>);
</span><span class="cx"> void removeSchedulePair(PassRefPtr<SchedulePair>);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170011 => 170012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-16 16:40:56 UTC (rev 170011)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-16 16:42:31 UTC (rev 170012)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-06-16 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Page::findStringMatchingRanges() should take Vector<RefPtr<Range>> by reference instead of pointer
+ https://bugs.webkit.org/show_bug.cgi?id=133677
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::findString): Update the call to Page::findStringMatchingRanges() to pass
+ in a Vector<RefPtr<Range>> reference instead of a pointer.
+ (WebKit::FindController::findStringMatches): Ditto.
+
+2014-06-16 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Unreviewed build fixes for the EFL and GTK+ ports after r169994 and 170000.
</span><span class="cx">
</span><span class="cx"> * UIProcess/API/C/WKPluginSiteDataManager.cpp: Undefine the None macro under X11.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp (170011 => 170012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2014-06-16 16:40:56 UTC (rev 170011)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2014-06-16 16:42:31 UTC (rev 170012)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> if (fs.selectionBounds().isEmpty()) {
</span><span class="cx"> m_findMatches.clear();
</span><span class="cx"> int indexForSelection;
</span><del>- m_webPage->corePage()->findStringMatchingRanges(string, core(options), maxMatchCount, &m_findMatches, indexForSelection);
</del><ins>+ m_webPage->corePage()->findStringMatchingRanges(string, core(options), maxMatchCount, m_findMatches, indexForSelection);
</ins><span class="cx"> m_foundStringMatchIndex = indexForSelection;
</span><span class="cx"> foundStringStartsAfterSelection = true;
</span><span class="cx"> }
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> m_findMatches.clear();
</span><span class="cx"> int indexForSelection;
</span><span class="cx">
</span><del>- m_webPage->corePage()->findStringMatchingRanges(string, core(options), maxMatchCount, &m_findMatches, indexForSelection);
</del><ins>+ m_webPage->corePage()->findStringMatchingRanges(string, core(options), maxMatchCount, m_findMatches, indexForSelection);
</ins><span class="cx">
</span><span class="cx"> Vector<Vector<IntRect>> matchRects;
</span><span class="cx"> for (size_t i = 0; i < m_findMatches.size(); ++i) {
</span></span></pre>
</div>
</div>
</body>
</html>