<!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>[166329] trunk/Source/WebCore</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/166329">166329</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-03-26 16:58:15 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize the loops in InspectorPageAgent.cpp.
Also moves the check for hiddenFromInspector to a lower level.
This hides hidden resources from more places.
https://bugs.webkit.org/show_bug.cgi?id=130803
Reviewed by Joseph Pecoraro.
* inspector/InspectorPageAgent.cpp:
(WebCore::buildArrayForCookies):
(WebCore::cachedResourcesForFrame):
(WebCore::allResourcesURLsForFrame):
(WebCore::InspectorPageAgent::getCookies):
(WebCore::InspectorPageAgent::searchInResources):
(WebCore::InspectorPageAgent::didClearWindowObjectInWorld):
(WebCore::InspectorPageAgent::loaderDetachedFromFrame):
(WebCore::InspectorPageAgent::buildObjectForFrameTree):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166328 => 166329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-26 23:51:12 UTC (rev 166328)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 23:58:15 UTC (rev 166329)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-26 Timothy Hatcher <timothy@apple.com>
+
+ Modernize the loops in InspectorPageAgent.cpp.
+
+ Also moves the check for hiddenFromInspector to a lower level.
+ This hides hidden resources from more places.
+
+ https://bugs.webkit.org/show_bug.cgi?id=130803
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::buildArrayForCookies):
+ (WebCore::cachedResourcesForFrame):
+ (WebCore::allResourcesURLsForFrame):
+ (WebCore::InspectorPageAgent::getCookies):
+ (WebCore::InspectorPageAgent::searchInResources):
+ (WebCore::InspectorPageAgent::didClearWindowObjectInWorld):
+ (WebCore::InspectorPageAgent::loaderDetachedFromFrame):
+ (WebCore::InspectorPageAgent::buildObjectForFrameTree):
+
</ins><span class="cx"> 2014-03-26 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
</span><span class="cx">
</span><span class="cx"> Add platform implementation for RTCOfferAnswerOptions and RTCOfferOptions
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (166328 => 166329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-03-26 23:51:12 UTC (rev 166328)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-03-26 23:58:15 UTC (rev 166329)
</span><span class="lines">@@ -451,10 +451,8 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>> cookies = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>::create();
</span><span class="cx">
</span><del>- ListHashSet<Cookie>::iterator end = cookiesList.end();
- ListHashSet<Cookie>::iterator it = cookiesList.begin();
- for (int i = 0; it != end; ++it, i++)
- cookies->addItem(buildObjectForCookie(*it));
</del><ins>+ for (auto& cookie : cookiesList)
+ cookies->addItem(buildObjectForCookie(cookie));
</ins><span class="cx">
</span><span class="cx"> return cookies;
</span><span class="cx"> }
</span><span class="lines">@@ -463,10 +461,10 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<CachedResource*> result;
</span><span class="cx">
</span><del>- const CachedResourceLoader::DocumentResourceMap& allResources = frame->document()->cachedResourceLoader()->allCachedResources();
- CachedResourceLoader::DocumentResourceMap::const_iterator end = allResources.end();
- for (CachedResourceLoader::DocumentResourceMap::const_iterator it = allResources.begin(); it != end; ++it) {
- CachedResource* cachedResource = it->value.get();
</del><ins>+ for (auto& cachedResourceHandle : frame->document()->cachedResourceLoader()->allCachedResources().values()) {
+ auto* cachedResource = cachedResourceHandle.get();
+ if (cachedResource->resourceRequest().hiddenFromInspector())
+ continue;
</ins><span class="cx">
</span><span class="cx"> switch (cachedResource->type()) {
</span><span class="cx"> case CachedResource::ImageResource:
</span><span class="lines">@@ -493,9 +491,8 @@
</span><span class="cx">
</span><span class="cx"> result.append(frame->loader().documentLoader()->url());
</span><span class="cx">
</span><del>- Vector<CachedResource*> allResources = cachedResourcesForFrame(frame);
- for (Vector<CachedResource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it)
- result.append((*it)->url());
</del><ins>+ for (auto* cachedResource : cachedResourcesForFrame(frame))
+ result.append(cachedResource->url());
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -515,13 +512,13 @@
</span><span class="cx">
</span><span class="cx"> for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext(mainFrame())) {
</span><span class="cx"> Document* document = frame->document();
</span><del>- Vector<URL> allURLs = allResourcesURLsForFrame(frame);
- for (Vector<URL>::const_iterator it = allURLs.begin(); it != allURLs.end(); ++it) {
</del><ins>+
+ for (auto& url : allResourcesURLsForFrame(frame)) {
</ins><span class="cx"> Vector<Cookie> docCookiesList;
</span><del>- rawCookiesImplemented = getRawCookies(document, URL(ParsedURLString, *it), docCookiesList);
</del><ins>+ rawCookiesImplemented = getRawCookies(document, URL(ParsedURLString, url), docCookiesList);
+
</ins><span class="cx"> if (!rawCookiesImplemented) {
</span><span class="cx"> // FIXME: We need duplication checking for the String representation of cookies.
</span><del>- //
</del><span class="cx"> // Exceptions are thrown by cookie() in sandboxed frames. That won't happen here
</span><span class="cx"> // because "document" is the document of the main frame of the page.
</span><span class="cx"> stringCookiesList.append(document->cookie(ASSERT_NO_EXCEPTION));
</span><span class="lines">@@ -629,15 +626,15 @@
</span><span class="cx">
</span><span class="cx"> for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext(&m_page->mainFrame())) {
</span><span class="cx"> String content;
</span><del>- Vector<CachedResource*> allResources = cachedResourcesForFrame(frame);
- for (Vector<CachedResource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it) {
- CachedResource* cachedResource = *it;
</del><ins>+
+ for (auto* cachedResource : cachedResourcesForFrame(frame)) {
</ins><span class="cx"> if (textContentForCachedResource(cachedResource, &content)) {
</span><span class="cx"> int matchesCount = ContentSearchUtilities::countRegularExpressionMatches(regex, content);
</span><span class="cx"> if (matchesCount)
</span><span class="cx"> searchResults->addItem(buildObjectForSearchResult(frameId(frame), cachedResource->url(), matchesCount));
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (mainResourceContent(frame, false, &content)) {
</span><span class="cx"> int matchesCount = ContentSearchUtilities::countRegularExpressionMatches(regex, content);
</span><span class="cx"> if (matchesCount)
</span><span class="lines">@@ -749,10 +746,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_scriptsToEvaluateOnLoad) {
</span><del>- InspectorObject::const_iterator end = m_scriptsToEvaluateOnLoad->end();
- for (InspectorObject::const_iterator it = m_scriptsToEvaluateOnLoad->begin(); it != end; ++it) {
</del><ins>+ for (auto& keyValuePair : *m_scriptsToEvaluateOnLoad) {
</ins><span class="cx"> String scriptText;
</span><del>- if (it->value->asString(&scriptText))
</del><ins>+ if (keyValuePair.value->asString(&scriptText))
</ins><span class="cx"> frame->script().executeScript(scriptText);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -862,9 +858,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorPageAgent::loaderDetachedFromFrame(DocumentLoader* loader)
</span><span class="cx"> {
</span><del>- HashMap<DocumentLoader*, String>::iterator iterator = m_loaderToIdentifier.find(loader);
- if (iterator != m_loaderToIdentifier.end())
- m_loaderToIdentifier.remove(iterator);
</del><ins>+ m_loaderToIdentifier.remove(loader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorPageAgent::frameStartedLoading(Frame& frame)
</span><span class="lines">@@ -974,13 +968,7 @@
</span><span class="cx"> .setFrame(frameObject)
</span><span class="cx"> .setResources(subresources);
</span><span class="cx">
</span><del>- Vector<CachedResource*> allResources = cachedResourcesForFrame(frame);
- for (Vector<CachedResource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it) {
- CachedResource* cachedResource = *it;
-
- if (cachedResource->resourceRequest().hiddenFromInspector())
- continue;
-
</del><ins>+ for (auto* cachedResource : cachedResourcesForFrame(frame)) {
</ins><span class="cx"> RefPtr<Inspector::TypeBuilder::Page::FrameResourceTree::Resources> resourceObject = Inspector::TypeBuilder::Page::FrameResourceTree::Resources::create()
</span><span class="cx"> .setUrl(cachedResource->url())
</span><span class="cx"> .setType(cachedResourceTypeJson(*cachedResource))
</span></span></pre>
</div>
</div>
</body>
</html>