<!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>[178291] 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/178291">178291</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-01-12 12:22:53 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up FrameTree::traverseNext() traversals of main frames
https://bugs.webkit.org/show_bug.cgi?id=140338
Reviewed by Andreas Kling.
There's no reason to pass the main frame as the stayWithin parameter
to FrameTree::traverseNext() when traversing over that same main frame.
Source/WebCore:
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::getFramesWithManifests):
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::getCookies):
(WebCore::InspectorPageAgent::deleteCookie):
(WebCore::InspectorPageAgent::searchInResources):
* replay/SerializationMethods.cpp:
(WebCore::frameIndexFromFrame):
(WebCore::frameFromFrameIndex):
Source/WebKit2:
* WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
(WebKit::WebContextMenuClient::searchWithSpotlight):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorereplaySerializationMethodscpp">trunk/Source/WebCore/replay/SerializationMethods.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebContextMenuClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178290 => 178291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-12 20:22:10 UTC (rev 178290)
+++ trunk/Source/WebCore/ChangeLog 2015-01-12 20:22:53 UTC (rev 178291)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-12 Zan Dobersek <zdobersek@igalia.com>
+
+ Clean up FrameTree::traverseNext() traversals of main frames
+ https://bugs.webkit.org/show_bug.cgi?id=140338
+
+ Reviewed by Andreas Kling.
+
+ There's no reason to pass the main frame as the stayWithin parameter
+ to FrameTree::traverseNext() when traversing over that same main frame.
+
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::getFramesWithManifests):
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::getCookies):
+ (WebCore::InspectorPageAgent::deleteCookie):
+ (WebCore::InspectorPageAgent::searchInResources):
+ * replay/SerializationMethods.cpp:
+ (WebCore::frameIndexFromFrame):
+ (WebCore::frameFromFrameIndex):
+
</ins><span class="cx"> 2015-01-12 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Multi-rect TextIndicators are vertically flipped in WebKit1
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (178290 => 178291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-01-12 20:22:10 UTC (rev 178290)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-01-12 20:22:53 UTC (rev 178291)
</span><span class="lines">@@ -98,8 +98,7 @@
</span><span class="cx"> {
</span><span class="cx"> result = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>::create();
</span><span class="cx">
</span><del>- Frame* mainFrame = m_pageAgent->mainFrame();
- for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext(mainFrame)) {
</del><ins>+ for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().traverseNext()) {
</ins><span class="cx"> DocumentLoader* documentLoader = frame->loader().documentLoader();
</span><span class="cx"> if (!documentLoader)
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (178290 => 178291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-01-12 20:22:10 UTC (rev 178290)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-01-12 20:22:53 UTC (rev 178291)
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> // always return the same true/false value.
</span><span class="cx"> bool rawCookiesImplemented = false;
</span><span class="cx">
</span><del>- for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext(mainFrame())) {
</del><ins>+ for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
</ins><span class="cx"> Document* document = frame->document();
</span><span class="cx">
</span><span class="cx"> for (auto& url : allResourcesURLsForFrame(frame)) {
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx"> void InspectorPageAgent::deleteCookie(ErrorString&, const String& cookieName, const String& url)
</span><span class="cx"> {
</span><span class="cx"> URL parsedURL(ParsedURLString, url);
</span><del>- for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext(&m_page->mainFrame()))
</del><ins>+ for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext())
</ins><span class="cx"> WebCore::deleteCookie(frame->document(), parsedURL, cookieName);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
</span><span class="cx"> JSC::Yarr::RegularExpression regex = ContentSearchUtilities::createSearchRegex(text, caseSensitive, isRegex);
</span><span class="cx">
</span><del>- for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext(&m_page->mainFrame())) {
</del><ins>+ for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
</ins><span class="cx"> String content;
</span><span class="cx">
</span><span class="cx"> for (auto* cachedResource : cachedResourcesForFrame(frame)) {
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.cpp (178290 => 178291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.cpp 2015-01-12 20:22:10 UTC (rev 178290)
+++ trunk/Source/WebCore/replay/SerializationMethods.cpp 2015-01-12 20:22:53 UTC (rev 178291)
</span><span class="lines">@@ -82,8 +82,7 @@
</span><span class="cx"> ASSERT(targetFrame);
</span><span class="cx">
</span><span class="cx"> uint32_t currentIndex = 0;
</span><del>- const Frame* mainFrame = &targetFrame->tree().top();
- for (const Frame* frame = mainFrame; frame; ++currentIndex, frame = frame->tree().traverseNext(mainFrame)) {
</del><ins>+ for (const Frame* frame = &targetFrame->tree().top(); frame; ++currentIndex, frame = frame->tree().traverseNext()) {
</ins><span class="cx"> if (frame == targetFrame)
</span><span class="cx"> return currentIndex;
</span><span class="cx"> }
</span><span class="lines">@@ -103,10 +102,9 @@
</span><span class="cx"> ASSERT(page);
</span><span class="cx"> ASSERT(frameIndex >= 0);
</span><span class="cx">
</span><del>- MainFrame* mainFrame = &page->mainFrame();
- Frame* frame = mainFrame;
</del><ins>+ Frame* frame = &page->mainFrame();
</ins><span class="cx"> uint32_t currentIndex = 0;
</span><del>- for (; currentIndex < frameIndex && frame; ++currentIndex, frame = frame->tree().traverseNext(mainFrame)) { }
</del><ins>+ for (; currentIndex < frameIndex && frame; ++currentIndex, frame = frame->tree().traverseNext()) { }
</ins><span class="cx">
</span><span class="cx"> return frame;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178290 => 178291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-12 20:22:10 UTC (rev 178290)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-12 20:22:53 UTC (rev 178291)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-12 Zan Dobersek <zdobersek@igalia.com>
+
+ Clean up FrameTree::traverseNext() traversals of main frames
+ https://bugs.webkit.org/show_bug.cgi?id=140338
+
+ Reviewed by Andreas Kling.
+
+ There's no reason to pass the main frame as the stayWithin parameter
+ to FrameTree::traverseNext() when traversing over that same main frame.
+
+ * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
+ (WebKit::WebContextMenuClient::searchWithSpotlight):
+
</ins><span class="cx"> 2015-01-12 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Multi-rect TextIndicators are vertically flipped in WebKit1
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebContextMenuClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm (178290 => 178291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm 2015-01-12 20:22:10 UTC (rev 178290)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm 2015-01-12 20:22:53 UTC (rev 178291)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> Frame& mainFrame = m_page->corePage()->mainFrame();
</span><span class="cx">
</span><span class="cx"> Frame* selectionFrame = &mainFrame;
</span><del>- for (; selectionFrame; selectionFrame = selectionFrame->tree().traverseNext(&mainFrame)) {
</del><ins>+ for (; selectionFrame; selectionFrame = selectionFrame->tree().traverseNext()) {
</ins><span class="cx"> if (selectionFrame->selection().isRange())
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>