Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (254591 => 254592)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-15 19:14:50 UTC (rev 254591)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-15 19:14:53 UTC (rev 254592)
@@ -1,5 +1,70 @@
2020-01-14 Alan Coon <alanc...@apple.com>
+ Cherry-pick r254147. rdar://problem/58549096
+
+ Reformat WebFrameLoaderClient logging
+ https://bugs.webkit.org/show_bug.cgi?id=205869
+ <rdar://problem/58379240>
+
+ Reviewed by Brent Fulgham.
+
+ Update the format used by WebFrameLoaderClient in its RELEASE_LOG
+ logging. Use the format used by WebPageProxy and
+ NetworkResourceLoader, which is generally of the form:
+
+ <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values>
+
+ So, for example:
+
+ 0x4a1d7c310 - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition, page = 0x7f83ba009208
+
+ becomes:
+
+ 0x4a1d7c310 - [webFrame=0x7ff703f03b68, webFrameID=3, webPage=0x7ff704831808, webPageID=15] WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition
+
+ No new tests - no added or changed functionality.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254147 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-07 Keith Rollin <krol...@apple.com>
+
+ Reformat WebFrameLoaderClient logging
+ https://bugs.webkit.org/show_bug.cgi?id=205869
+ <rdar://problem/58379240>
+
+ Reviewed by Brent Fulgham.
+
+ Update the format used by WebFrameLoaderClient in its RELEASE_LOG
+ logging. Use the format used by WebPageProxy and
+ NetworkResourceLoader, which is generally of the form:
+
+ <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values>
+
+ So, for example:
+
+ 0x4a1d7c310 - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition, page = 0x7f83ba009208
+
+ becomes:
+
+ 0x4a1d7c310 - [webFrame=0x7ff703f03b68, webFrameID=3, webPage=0x7ff704831808, webPageID=15] WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition
+
+ No new tests - no added or changed functionality.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
+
+2020-01-14 Alan Coon <alanc...@apple.com>
+
Cherry-pick r254092. rdar://problem/58552872
NetworkSessionCocoa::isolatedSession should not use iterator after mutating m_isolatedSessions
Modified: branches/safari-609-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (254591 => 254592)
--- branches/safari-609-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2020-01-15 19:14:50 UTC (rev 254591)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2020-01-15 19:14:53 UTC (rev 254592)
@@ -96,6 +96,16 @@
#include <wtf/ProcessID.h>
#include <wtf/ProcessPrivilege.h>
+#define PREFIX_PARAMETERS "%p - [webFrame=%p, webFrameID=%" PRIu64 ", webPage=%p, webPageID=%" PRIu64 "] WebFrameLoaderClient::"
+#define WEBFRAME (webFrame())
+#define WEBFRAMEID (WEBFRAME ? WEBFRAME->frameID().toUInt64() : 0)
+#define WEBPAGE (WEBFRAME ? WEBFRAME->page() : nullptr)
+#define WEBPAGEID (WEBPAGE ? WEBPAGE->identifier().toUInt64() : 0)
+
+#define WEBFRAMELOADERCLIENT_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(channel, PREFIX_PARAMETERS fmt, this, WEBFRAME, WEBFRAMEID, WEBPAGE, WEBPAGEID, ##__VA_ARGS__)
+#define WEBFRAMELOADERCLIENT_RELEASE_LOG_ERROR(channel, fmt, ...) RELEASE_LOG_ERROR(channel, PREFIX_PARAMETERS fmt, this, WEBFRAME, WEBFRAMEID, WEBPAGE, WEBPAGEID, ##__VA_ARGS__)
+#define WEBFRAMELOADERCLIENT_RELEASE_LOG_FAULT(channel, fmt, ...) RELEASE_LOG_FAULT(channel, PREFIX_PARAMETERS fmt, this, WEBFRAME, WEBFRAMEID, WEBPAGE, WEBPAGEID, ##__VA_ARGS__)
+
namespace WebKit {
using namespace WebCore;
@@ -326,7 +336,7 @@
WebDocumentLoader* documentLoader = static_cast<WebDocumentLoader*>(m_frame->coreFrame()->loader().provisionalDocumentLoader());
if (!documentLoader) {
- RELEASE_LOG_FAULT(Loading, "WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad called with no provisional DocumentLoader. FrameState is %i. FrameLoaderStateMachine stateForDebugging - %i", m_frame->coreFrame()->loader().state(), m_frame->coreFrame()->loader().stateMachine().stateForDebugging());
+ WEBFRAMELOADERCLIENT_RELEASE_LOG_FAULT(Loading, "dispatchDidReceiveServerRedirectForProvisionalLoad: Called with no provisional DocumentLoader (frameState=%i, stateForDebugging=%i)", m_frame->coreFrame()->loader().state(), m_frame->coreFrame()->loader().stateMachine().stateForDebugging());
return;
}
@@ -560,7 +570,7 @@
if (!webPage)
return;
- RELEASE_LOG(Network, "%p - WebFrameLoaderClient::dispatchDidFailProvisionalLoad: (webPageID=%" PRIu64 ", frameID=%" PRIu64 ")", this, webPage->identifier().toUInt64(), m_frame->frameID().toUInt64());
+ WEBFRAMELOADERCLIENT_RELEASE_LOG(Network, "dispatchDidFailProvisionalLoad:");
RefPtr<API::Object> userData;
@@ -596,7 +606,7 @@
if (!webPage)
return;
- RELEASE_LOG(Network, "%p - WebFrameLoaderClient::dispatchDidFailLoad: (webPageID=%" PRIu64 ", frameID=%" PRIu64 ")", this, webPage->identifier().toUInt64(), m_frame->frameID().toUInt64());
+ WEBFRAMELOADERCLIENT_RELEASE_LOG(Network, "dispatchDidFailLoad:");
RefPtr<API::Object> userData;
@@ -677,7 +687,7 @@
RefPtr<API::Object> userData;
if (milestones & DidFirstLayout) {
- RELEASE_LOG(Layout, "%p - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching DidFirstLayoutForFrame, page = %p", this, webPage);
+ WEBFRAMELOADERCLIENT_RELEASE_LOG(Layout, "dispatchDidReachLayoutMilestone: dispatching DidFirstLayoutForFrame");
// FIXME: We should consider removing the old didFirstLayout API since this is doing double duty with the
// new didLayout API.
@@ -687,7 +697,7 @@
#if PLATFORM(MAC)
// FIXME: Do this on DidFirstVisuallyNonEmptyLayout when Mac Safari is able to handle it (<rdar://problem/17580021>)
if (m_frame->isMainFrame() && !m_didCompletePageTransition && !webPage->corePage()->settings().suppressesIncrementalRendering()) {
- RELEASE_LOG(Layout, "%p - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition, page = %p", this, webPage);
+ WEBFRAMELOADERCLIENT_RELEASE_LOG(Layout, "dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition");
webPage->didCompletePageTransition();
m_didCompletePageTransition = true;
}
@@ -719,7 +729,7 @@
addIfSet(DidRenderSignificantAmountOfText, "DidRenderSignificantAmountOfText"_s);
addIfSet(DidFirstMeaningfulPaint, "DidFirstMeaningfulPaint"_s);
- RELEASE_LOG(Layout, "%p - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching DidReachLayoutMilestone, page = %p, milestones = %{public}s", this, webPage, builder.toString().utf8().data());
+ WEBFRAMELOADERCLIENT_RELEASE_LOG(Layout, "dispatchDidReachLayoutMilestone: dispatching DidReachLayoutMilestone (milestones=%{public}s)", builder.toString().utf8().data());
#endif
// Send this after DidFirstLayout-specific calls since some clients expect to get those messages first.
@@ -727,7 +737,7 @@
if (milestones & DidFirstVisuallyNonEmptyLayout) {
if (m_frame->isMainFrame() && !m_didCompletePageTransition && !webPage->corePage()->settings().suppressesIncrementalRendering()) {
- RELEASE_LOG(Layout, "%p - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition, page = %p", this, webPage);
+ WEBFRAMELOADERCLIENT_RELEASE_LOG(Layout, "dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition");
webPage->didCompletePageTransition();
m_didCompletePageTransition = true;
}
@@ -734,7 +744,7 @@
// FIXME: We should consider removing the old didFirstVisuallyNonEmptyLayoutForFrame API since this is doing
// double duty with the new didLayout API.
- RELEASE_LOG(Layout, "%p - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching DidFirstVisuallyNonEmptyLayoutForFrame, page = %p", this, webPage);
+ WEBFRAMELOADERCLIENT_RELEASE_LOG(Layout, "dispatchDidReachLayoutMilestone: dispatching DidFirstVisuallyNonEmptyLayoutForFrame");
webPage->injectedBundleLoaderClient().didFirstVisuallyNonEmptyLayoutForFrame(*webPage, *m_frame, userData);
webPage->send(Messages::WebPageProxy::DidFirstVisuallyNonEmptyLayoutForFrame(m_frame->frameID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
}
@@ -1923,3 +1933,9 @@
#endif // ENABLE(APPLICATION_MANIFEST)
} // namespace WebKit
+
+#undef PREFIX_PARAMETERS
+#undef WEBFRAME
+#undef WEBFRAMEID
+#undef WEBPAGE
+#undef WEBPAGEID
