Title: [165427] trunk/Source/WebCore
- Revision
- 165427
- Author
- [email protected]
- Date
- 2014-03-10 21:22:10 -0700 (Mon, 10 Mar 2014)
Log Message
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 <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165426 => 165427)
--- 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)
@@ -1,3 +1,24 @@
+2014-03-10 Joseph Pecoraro <[email protected]>
+
+ 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.
+
2014-03-10 Jinwoo Song <[email protected]>
Remove 'visibilitychange' attribute event listener from document
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (165426 => 165427)
--- 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)
@@ -2995,8 +2995,6 @@
void FrameLoader::loadedResourceFromMemoryCache(CachedResource* resource, ResourceRequest& newRequest)
{
- newRequest = ResourceRequest(resource->url());
-
Page* page = m_frame.page();
if (!page)
return;
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (165426 => 165427)
--- 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)
@@ -393,12 +393,16 @@
return true;
}
-bool CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache(CachedResource* resource)
+bool CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest& request, CachedResource* resource)
{
if (!resource || !frame() || resource->status() != CachedResource::Cached)
return true;
- ResourceRequest newRequest;
+ ResourceRequest newRequest = ResourceRequest(resource->url());
+#if ENABLE(INSPECTOR)
+ if (request.resourceRequest().hiddenFromInspector())
+ newRequest.setHiddenFromInspector(true);
+#endif
frame()->loader().loadedResourceFromMemoryCache(resource, newRequest);
// FIXME <http://webkit.org/b/113251>: If the delegate modifies the request's
@@ -453,7 +457,7 @@
resource = revalidateResource(request, resource.get());
break;
case Use:
- if (!shouldContinueAfterNotifyingLoadedFromMemoryCache(resource.get()))
+ if (!shouldContinueAfterNotifyingLoadedFromMemoryCache(request, resource.get()))
return 0;
memoryCache()->resourceAccessed(resource.get());
break;
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (165426 => 165427)
--- 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)
@@ -147,7 +147,7 @@
enum RevalidationPolicy { Use, Revalidate, Reload, Load };
RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, ResourceRequest&, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption) const;
- bool shouldContinueAfterNotifyingLoadedFromMemoryCache(CachedResource*);
+ bool shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest&, CachedResource*);
bool checkInsecureContent(CachedResource::Type, const URL&) const;
void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>&);
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (165426 => 165427)
--- 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)
@@ -781,7 +781,9 @@
ResourceRequest request(m_url);
request.setHTTPMethod(m_method);
+#if ENABLE(INSPECTOR)
request.setHiddenFromInspector(m_sendingForInspector);
+#endif
InspectorInstrumentation::willLoadXHR(scriptExecutionContext(), this, m_method, m_url, m_async, m_requestEntityBody ? m_requestEntityBody->deepCopy() : 0, m_requestHeaders, m_includeCredentials);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
