Modified: trunk/Source/WebKit2/ChangeLog (215293 => 215294)
--- trunk/Source/WebKit2/ChangeLog 2017-04-12 21:34:46 UTC (rev 215293)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-12 21:46:09 UTC (rev 215294)
@@ -1,3 +1,20 @@
+2017-04-12 Keith Rollin <[email protected]>
+
+ Add some missing NetworkResourceLoader logging
+ https://bugs.webkit.org/show_bug.cgi?id=170139
+
+ Reviewed by Alex Christensen.
+
+ Once execution enters the lambda in
+ NetworkResourceLoader::retrieveCacheEntry, there is little indication
+ of which exit point was taken. If flow enters into startNetworkLoad,
+ we'll get some logging from that function, but not from the others.
+ Add some logging so that we know what the result was from looking up
+ the resource in the cache.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::retrieveCacheEntry):
+
2017-04-12 Anders Carlsson <[email protected]>
Tweak WebCore::setMetadataURL function
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (215293 => 215294)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-04-12 21:34:46 UTC (rev 215293)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-04-12 21:46:09 UTC (rev 215294)
@@ -178,27 +178,32 @@
ASSERT(canUseCache(request));
RefPtr<NetworkResourceLoader> loader(this);
- NetworkCache::singleton().retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [loader = WTFMove(loader), request](auto entry) {
+ NetworkCache::singleton().retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [this, loader = WTFMove(loader), request](auto entry) {
if (loader->hasOneRef()) {
// The loader has been aborted and is only held alive by this lambda.
return;
}
if (!entry) {
+ RELEASE_LOG_IF_ALLOWED("retrieveCacheEntry: Resource not in cache (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
loader->startNetworkLoad(request);
return;
}
if (entry->redirectRequest()) {
+ RELEASE_LOG_IF_ALLOWED("retrieveCacheEntry: Handling redirect (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
loader->dispatchWillSendRequestForCacheEntry(WTFMove(entry));
return;
}
if (loader->m_parameters.needsCertificateInfo && !entry->response().certificateInfo()) {
+ RELEASE_LOG_IF_ALLOWED("retrieveCacheEntry: Resource does not have required certificate (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
loader->startNetworkLoad(request);
return;
}
if (entry->needsValidation() || request.cachePolicy() == WebCore::RefreshAnyCacheData) {
+ RELEASE_LOG_IF_ALLOWED("retrieveCacheEntry: Validating cache entry (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
loader->validateCacheEntry(WTFMove(entry));
return;
}
+ RELEASE_LOG_IF_ALLOWED("retrieveCacheEntry: Retrieved resource from cache (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
loader->didRetrieveCacheEntry(WTFMove(entry));
});
}