<!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>[165427] 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/165427">165427</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-10 21:22:10 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Frontend loaded resources from cache are not hidden as expected
https://bugs.webkit.org/show_bug.cgi?id=130044
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-03-10
Reviewed by Timothy Hatcher.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadedResourceFromMemoryCache):
Use the new request that was passed in. Assume it is filled in appropriately.
* loader/cache/CachedResourceLoader.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache):
Carry over the hidden from inspector state if the passed in request had it,
and create the request that loadedResourceFromMemoryCache will use.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):
Add missing ifdefs for INSPECTOR only function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165426 => 165427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-11 04:06:31 UTC (rev 165426)
+++ trunk/Source/WebCore/ChangeLog 2014-03-11 04:22:10 UTC (rev 165427)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-10 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Frontend loaded resources from cache are not hidden as expected
+ https://bugs.webkit.org/show_bug.cgi?id=130044
+
+ Reviewed by Timothy Hatcher.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadedResourceFromMemoryCache):
+ Use the new request that was passed in. Assume it is filled in appropriately.
+
+ * loader/cache/CachedResourceLoader.h:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache):
+ Carry over the hidden from inspector state if the passed in request had it,
+ and create the request that loadedResourceFromMemoryCache will use.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+ Add missing ifdefs for INSPECTOR only function.
+
</ins><span class="cx"> 2014-03-10 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove 'visibilitychange' attribute event listener from document
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (165426 => 165427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-03-11 04:06:31 UTC (rev 165426)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-03-11 04:22:10 UTC (rev 165427)
</span><span class="lines">@@ -2995,8 +2995,6 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::loadedResourceFromMemoryCache(CachedResource* resource, ResourceRequest& newRequest)
</span><span class="cx"> {
</span><del>- newRequest = ResourceRequest(resource->url());
-
</del><span class="cx"> Page* page = m_frame.page();
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (165426 => 165427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-03-11 04:06:31 UTC (rev 165426)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-03-11 04:22:10 UTC (rev 165427)
</span><span class="lines">@@ -393,12 +393,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache(CachedResource* resource)
</del><ins>+bool CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest& request, CachedResource* resource)
</ins><span class="cx"> {
</span><span class="cx"> if (!resource || !frame() || resource->status() != CachedResource::Cached)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- ResourceRequest newRequest;
</del><ins>+ ResourceRequest newRequest = ResourceRequest(resource->url());
+#if ENABLE(INSPECTOR)
+ if (request.resourceRequest().hiddenFromInspector())
+ newRequest.setHiddenFromInspector(true);
+#endif
</ins><span class="cx"> frame()->loader().loadedResourceFromMemoryCache(resource, newRequest);
</span><span class="cx">
</span><span class="cx"> // FIXME <http://webkit.org/b/113251>: If the delegate modifies the request's
</span><span class="lines">@@ -453,7 +457,7 @@
</span><span class="cx"> resource = revalidateResource(request, resource.get());
</span><span class="cx"> break;
</span><span class="cx"> case Use:
</span><del>- if (!shouldContinueAfterNotifyingLoadedFromMemoryCache(resource.get()))
</del><ins>+ if (!shouldContinueAfterNotifyingLoadedFromMemoryCache(request, resource.get()))
</ins><span class="cx"> return 0;
</span><span class="cx"> memoryCache()->resourceAccessed(resource.get());
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (165426 => 165427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2014-03-11 04:06:31 UTC (rev 165426)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2014-03-11 04:22:10 UTC (rev 165427)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> enum RevalidationPolicy { Use, Revalidate, Reload, Load };
</span><span class="cx"> RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, ResourceRequest&, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption) const;
</span><span class="cx">
</span><del>- bool shouldContinueAfterNotifyingLoadedFromMemoryCache(CachedResource*);
</del><ins>+ bool shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest&, CachedResource*);
</ins><span class="cx"> bool checkInsecureContent(CachedResource::Type, const URL&) const;
</span><span class="cx">
</span><span class="cx"> void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>&);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (165426 => 165427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-03-11 04:06:31 UTC (rev 165426)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-03-11 04:22:10 UTC (rev 165427)
</span><span class="lines">@@ -781,7 +781,9 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(m_url);
</span><span class="cx"> request.setHTTPMethod(m_method);
</span><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> request.setHiddenFromInspector(m_sendingForInspector);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::willLoadXHR(scriptExecutionContext(), this, m_method, m_url, m_async, m_requestEntityBody ? m_requestEntityBody->deepCopy() : 0, m_requestHeaders, m_includeCredentials);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>