Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (254579 => 254580)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-15 19:12:20 UTC (rev 254579)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-15 19:14:14 UTC (rev 254580)
@@ -1,3 +1,74 @@
+2020-01-14 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r254033. rdar://problem/58548645
+
+ Reformat WebPage logging
+ https://bugs.webkit.org/show_bug.cgi?id=205705
+ <rdar://problem/58288704>
+
+ Reviewed by Alex Christensen.
+
+ Update the format used by WebPage 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:
+
+ 0x7f83ba009208 - WebPage (webPageID=15) - Adding a reason 1 to freeze layer tree (now 1); old reasons were 0
+
+ becomes:
+
+ 0x7f83ba009208 - [webPageID=15] WebPage::freezeLayerTree: Adding a reason to freeze layer tree (reason=1, new=1, old=0)
+
+ No new tests - no added or changed functionality.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_overriddenMediaType):
+ (WebKit::WebPage::createPlugin):
+ (WebKit::WebPage::freezeLayerTree):
+ (WebKit::WebPage::unfreezeLayerTree):
+ (WebKit::WebPage::markLayersVolatile):
+ (WebKit::WebPage::cancelMarkLayersVolatile):
+ (WebKit::WebPage::touchEventSync):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254033 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-04 Keith Rollin <krol...@apple.com>
+
+ Reformat WebPage logging
+ https://bugs.webkit.org/show_bug.cgi?id=205705
+ <rdar://problem/58288704>
+
+ Reviewed by Alex Christensen.
+
+ Update the format used by WebPage 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:
+
+ 0x7f83ba009208 - WebPage (webPageID=15) - Adding a reason 1 to freeze layer tree (now 1); old reasons were 0
+
+ becomes:
+
+ 0x7f83ba009208 - [webPageID=15] WebPage::freezeLayerTree: Adding a reason to freeze layer tree (reason=1, new=1, old=0)
+
+ No new tests - no added or changed functionality.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_overriddenMediaType):
+ (WebKit::WebPage::createPlugin):
+ (WebKit::WebPage::freezeLayerTree):
+ (WebKit::WebPage::unfreezeLayerTree):
+ (WebKit::WebPage::markLayersVolatile):
+ (WebKit::WebPage::cancelMarkLayersVolatile):
+ (WebKit::WebPage::touchEventSync):
+
2020-01-13 Alan Coon <alanc...@apple.com>
Cherry-pick r254101. rdar://problem/58535157
Modified: branches/safari-609-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (254579 => 254580)
--- branches/safari-609-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-01-15 19:12:20 UTC (rev 254579)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-01-15 19:14:14 UTC (rev 254580)
@@ -325,8 +325,8 @@
static const Seconds initialLayerVolatilityTimerInterval { 20_ms };
static const Seconds maximumLayerVolatilityTimerInterval { 2_s };
-#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), channel, "%p - WebPage::" fmt, this, ##__VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), channel, "%p - WebPage::" fmt, this, ##__VA_ARGS__)
+#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [webPageID=%" PRIu64 "] WebPage::" fmt, this, m_identifier.toUInt64(), ##__VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [webPageID=%" PRIu64 "] WebPage::" fmt, this, m_identifier.toUInt64(), ##__VA_ARGS__)
class SendStopResponsivenessTimer {
public:
@@ -702,7 +702,7 @@
m_contextForVisibilityPropagation = LayerHostingContext::createForExternalHostingProcess({
m_canShowWhileLocked
});
- RELEASE_LOG(Process, "Created context with ID %d for visibility propagation from UIProcess", m_contextForVisibilityPropagation->contextID());
+ RELEASE_LOG_IF_ALLOWED(Process, "WebPage: Created context with ID %d for visibility propagation from UIProcess", m_contextForVisibilityPropagation->contextID());
send(Messages::WebPageProxy::DidCreateContextForVisibilityPropagation(m_contextForVisibilityPropagation->contextID()));
#endif
@@ -1000,7 +1000,7 @@
return nullptr;
if (m_page->settings().blockingOfSmallPluginsEnabled() && pluginIsSmall(*pluginElement)) {
- RELEASE_LOG(Plugins, "Blocking a plugin because it is too small");
+ RELEASE_LOG_IF_ALLOWED(Plugins, "createPlugin: Blocking a plugin because it is too small");
pluginElement->setReplacement(RenderEmbeddedObject::PluginTooSmall, pluginTooSmallText());
return nullptr;
}
@@ -2526,7 +2526,7 @@
auto oldReasons = m_layerTreeFreezeReasons.toRaw();
UNUSED_PARAM(oldReasons);
m_layerTreeFreezeReasons.add(reason);
- RELEASE_LOG(ProcessSuspension, "%p - WebPage (webPageID=%llu) - Adding a reason %d to freeze layer tree (now %d); old reasons were %d", this, m_identifier.toUInt64(), static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw(), oldReasons);
+ RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "freezeLayerTree: Adding a reason to freeze layer tree (reason=%d, new=%d, old=%d)", static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw(), oldReasons);
updateDrawingAreaLayerTreeFreezeState();
}
@@ -2535,7 +2535,7 @@
auto oldReasons = m_layerTreeFreezeReasons.toRaw();
UNUSED_PARAM(oldReasons);
m_layerTreeFreezeReasons.remove(reason);
- RELEASE_LOG(ProcessSuspension, "%p - WebPage (webPageID=%llu) - Removing a reason %d to freeze layer tree (now %d); old reasons were %d", this, m_identifier.toUInt64(), static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw(), oldReasons);
+ RELEASE_LOG_IF_ALLOWED(ProcessSuspension, "unfreezeLayerTree: Removing a reason to freeze layer tree (reason=%d, new=%d, old=%d)", static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw(), oldReasons);
updateDrawingAreaLayerTreeFreezeState();
}
@@ -2578,7 +2578,7 @@
void WebPage::markLayersVolatile(WTF::Function<void (bool)>&& completionHandler)
{
- RELEASE_LOG_IF_ALLOWED(Layers, "markLayersVolatile");
+ RELEASE_LOG_IF_ALLOWED(Layers, "markLayersVolatile:");
if (m_layerVolatilityTimer.isActive())
m_layerVolatilityTimer.stop();
@@ -2604,7 +2604,7 @@
void WebPage::cancelMarkLayersVolatile()
{
- RELEASE_LOG_IF_ALLOWED(Layers, "cancelMarkLayersVolatile");
+ RELEASE_LOG_IF_ALLOWED(Layers, "cancelMarkLayersVolatile:");
m_layerVolatilityTimer.stop();
m_markLayersAsVolatileCompletionHandlers.clear();
}
@@ -2912,7 +2912,7 @@
{
// Avoid UIProcess hangs when the WebContent process is stuck on a sync IPC.
if (IPC::UnboundedSynchronousIPCScope::hasOngoingUnboundedSyncIPC()) {
- RELEASE_LOG_ERROR_IF_ALLOWED(Process, "touchEventSync - Not processing because the process is stuck on unbounded sync IPC");
+ RELEASE_LOG_ERROR_IF_ALLOWED(Process, "touchEventSync: Not processing because the process is stuck on unbounded sync IPC");
return reply(true);
}
