Title: [207749] branches/safari-602-branch/Source/WebKit2
- Revision
- 207749
- Author
- matthew_han...@apple.com
- Date
- 2016-10-24 00:18:54 -0700 (Mon, 24 Oct 2016)
Log Message
Merge r206123. rdar://problem/28544885
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207748 => 207749)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-24 07:18:51 UTC (rev 207748)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-24 07:18:54 UTC (rev 207749)
@@ -1,5 +1,22 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r206123. rdar://problem/28544885
+
+ 2016-09-19 Keith Rollin <krol...@apple.com>
+
+ Reduce logging from WebResourceLoader::didReceiveData
+ https://bugs.webkit.org/show_bug.cgi?id=162233
+
+ Reviewed by Antti Koivisto.
+
+ Only log once even if called multiple times for a single resource.
+
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveData):
+ * WebProcess/Network/WebResourceLoader.h:
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r207159. rdar://problem/28857481
2016-10-11 Daniel Bates <daba...@apple.com>
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (207748 => 207749)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-10-24 07:18:51 UTC (rev 207748)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-10-24 07:18:54 UTC (rev 207749)
@@ -133,8 +133,12 @@
void WebResourceLoader::didReceiveData(const IPC::DataReference& data, int64_t encodedDataLength)
{
LOG(Network, "(WebProcess) WebResourceLoader::didReceiveData of size %lu for '%s'", data.size(), m_coreLoader->url().string().latin1().data());
- WEBRESOURCELOADER_LOG_ALWAYS("WebResourceLoader::didReceiveData, WebResourceLoader = %p, size = %lu", this, data.size());
+ if (!m_hasReceivedData) {
+ WEBRESOURCELOADER_LOG_ALWAYS("WebResourceLoader::didReceiveData, WebResourceLoader = %p, size = %lu", this, data.size());
+ m_hasReceivedData = true;
+ }
+
#if USE(QUICK_LOOK)
if (QuickLookHandle* quickLookHandle = m_coreLoader->documentLoader()->quickLookHandle()) {
if (quickLookHandle->didReceiveData(adoptCF(CFDataCreate(kCFAllocatorDefault, data.data(), data.size())).get()))
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.h (207748 => 207749)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2016-10-24 07:18:51 UTC (rev 207748)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2016-10-24 07:18:54 UTC (rev 207749)
@@ -86,6 +86,7 @@
#endif
RefPtr<WebCore::ResourceLoader> m_coreLoader;
+ bool m_hasReceivedData { false };
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
