Diff
Modified: trunk/LayoutTests/ChangeLog (275860 => 275861)
--- trunk/LayoutTests/ChangeLog 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/LayoutTests/ChangeLog 2021-04-13 04:57:38 UTC (rev 275861)
@@ -1,3 +1,15 @@
+2021-04-12 Julian Gonzalez <[email protected]>
+
+ [CoreIPC] Crash in logDiagnosticMessage code
+ https://bugs.webkit.org/show_bug.cgi?id=224390
+
+ Reviewed by Chris Dumez.
+
+ Add a test for this crasher.
+
+ * ipc/analytics-logger-crash-expected.txt: Added.
+ * ipc/analytics-logger-crash.html: Added.
+
2021-04-12 Commit Queue <[email protected]>
Unreviewed, reverting r275793.
Added: trunk/LayoutTests/ipc/analytics-logger-crash-expected.txt (0 => 275861)
--- trunk/LayoutTests/ipc/analytics-logger-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/ipc/analytics-logger-crash-expected.txt 2021-04-13 04:57:38 UTC (rev 275861)
@@ -0,0 +1 @@
+This test passes if it does not crash.
Added: trunk/LayoutTests/ipc/analytics-logger-crash.html (0 => 275861)
--- trunk/LayoutTests/ipc/analytics-logger-crash.html (rev 0)
+++ trunk/LayoutTests/ipc/analytics-logger-crash.html 2021-04-13 04:57:38 UTC (rev 275861)
@@ -0,0 +1,20 @@
+<!DOCTYPE html><!-- webkit-test-runner [ IPCTestingAPIEnabled=true ] -->
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+if (window.IPC) {
+ buf = new Uint8Array([0x21,0x0,0x0,0x0,0x0,0x0,0x0,0x21,0x0,0x0,0x0,0x0,0x0,0x0,0x21,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x21,0x0,0x0,0x0,0x0,0x0,0x0,0x21,0x0,0x0,0x0,0x0,0x0,0x0,0x21,0x0,0x0,0x0,0x0,0x0,0xfb,0x20,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x21,0x0,0x0,0x0,0x0,0x0,0x0,0x21,0xda,0xe,0xef,0xd,0x0,0x0,0x21,0x0,0x0,0x0,0x0,0x0,0x0,0x21,
+ 0x0,0x0,0x0,0x0,0x0,0x21,0x1,0x0,0x0,0x0,0x0,0x0,0x21,0x0,0x0,0x0,0x0,0x0,0x21,0x0,0x0,0x0,]);
+ IPC.sendMessage('UI',IPC.webPageProxyID,IPC.messages.WebPageProxy_LogDiagnosticMessageWithValueFromWebProcess.name,[buf]);
+}
+</script>
+<body>
+This test passes if it does not crash.
+</body>
+</head>
+</html>
\ No newline at end of file
Modified: trunk/Source/WebKit/ChangeLog (275860 => 275861)
--- trunk/Source/WebKit/ChangeLog 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/Source/WebKit/ChangeLog 2021-04-13 04:57:38 UTC (rev 275861)
@@ -1,3 +1,41 @@
+2021-04-12 Julian Gonzalez <[email protected]>
+
+ [CoreIPC] Crash in logDiagnosticMessage code
+ https://bugs.webkit.org/show_bug.cgi?id=224390
+
+ Reviewed by Chris Dumez.
+
+ Create new WebPageProxy::logDiagnosticMessage APIs designed to be called on messages that
+ need sanity checking, and hook that up to IPC handlers (while leaving existing APIs
+ for all other callers).
+
+ Test: ipc/analytics-logger-crash.html
+
+ * NetworkProcess/NetworkSession.cpp:
+ (WebKit::NetworkSession::logDiagnosticMessageWithValue):
+ * UIProcess/ProvisionalPageProxy.cpp:
+ (WebKit::ProvisionalPageProxy::logDiagnosticMessageFromWebProcess):
+ (WebKit::ProvisionalPageProxy::logDiagnosticMessageWithEnhancedPrivacyFromWebProcess):
+ (WebKit::ProvisionalPageProxy::logDiagnosticMessageWithValueDictionaryFromWebProcess):
+ (WebKit::ProvisionalPageProxy::didReceiveMessage):
+ * UIProcess/ProvisionalPageProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::logDiagnosticMessageFromWebProcess):
+ (WebKit::WebPageProxy::logDiagnosticMessageWithResultFromWebProcess):
+ (WebKit::WebPageProxy::logDiagnosticMessageWithValueFromWebProcess):
+ (WebKit::WebPageProxy::logDiagnosticMessageWithEnhancedPrivacyFromWebProcess):
+ (WebKit::WebPageProxy::logDiagnosticMessageWithValueDictionaryFromWebProcess):
+ (WebKit::WebPageProxy::logDiagnosticMessageWithDomainFromWebProcess):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessage):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithResult):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValue):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithEnhancedPrivacy):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValueDictionary):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithDomain):
+
2021-04-12 Jiewen Tan <[email protected]>
Force the WebAuthn compatible mode to always show UI
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp (275860 => 275861)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2021-04-13 04:57:38 UTC (rev 275861)
@@ -221,7 +221,7 @@
void NetworkSession::logDiagnosticMessageWithValue(const String& message, const String& description, unsigned value, unsigned significantFigures, WebCore::ShouldSample shouldSample)
{
- m_networkProcess->parentProcessConnection()->send(Messages::WebPageProxy::LogDiagnosticMessageWithValue(message, description, value, significantFigures, shouldSample), 0);
+ m_networkProcess->parentProcessConnection()->send(Messages::WebPageProxy::LogDiagnosticMessageWithValueFromWebProcess(message, description, value, significantFigures, shouldSample), 0);
}
void NetworkSession::deleteAndRestrictWebsiteDataForRegistrableDomains(OptionSet<WebsiteDataType> dataTypes, RegistrableDomainsToDeleteOrRestrictWebsiteDataFor&& domains, bool shouldNotifyPage, CompletionHandler<void(const HashSet<RegistrableDomain>&)>&& completionHandler)
Modified: trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp (275860 => 275861)
--- trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp 2021-04-13 04:57:38 UTC (rev 275861)
@@ -49,6 +49,8 @@
#include "WebProcessProxy.h"
#include <WebCore/ShouldTreatAsContinuingLoad.h>
+#define MESSAGE_CHECK(process, assertion) MESSAGE_CHECK_BASE(assertion, process->connection())
+
namespace WebKit {
using namespace WebCore;
@@ -374,6 +376,27 @@
m_page.decidePolicyForNavigationActionSyncShared(m_process.copyRef(), frameID, isMainFrame, WTFMove(frameInfoData), identifier, navigationID, WTFMove(navigationActionData), WTFMove(originatingFrameInfo), originatingPageID, originalRequest, WTFMove(request), WTFMove(requestBody), WTFMove(redirectResponse), userData, WTFMove(reply));
}
+void ProvisionalPageProxy::logDiagnosticMessageFromWebProcess(const String& message, const String& description, WebCore::ShouldSample shouldSample)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ m_page.logDiagnosticMessage(message, description, shouldSample);
+}
+
+void ProvisionalPageProxy::logDiagnosticMessageWithEnhancedPrivacyFromWebProcess(const String& message, const String& description, WebCore::ShouldSample shouldSample)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ m_page.logDiagnosticMessageWithEnhancedPrivacy(message, description, shouldSample);
+}
+
+void ProvisionalPageProxy::logDiagnosticMessageWithValueDictionaryFromWebProcess(const String& message, const String& description, const WebCore::DiagnosticLoggingClient::ValueDictionary& valueDictionary, WebCore::ShouldSample shouldSample)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ m_page.logDiagnosticMessageWithValueDictionary(message, description, valueDictionary, shouldSample);
+}
+
#if USE(QUICK_LOOK)
void ProvisionalPageProxy::requestPasswordForQuickLookDocumentInMainFrame(const String& fileName, CompletionHandler<void(const String&)>&& completionHandler)
{
@@ -425,9 +448,6 @@
|| decoder.messageName() == Messages::WebPageProxy::DidDestroyNavigation::name()
|| decoder.messageName() == Messages::WebPageProxy::DidFinishProgress::name()
|| decoder.messageName() == Messages::WebPageProxy::BackForwardAddItem::name()
- || decoder.messageName() == Messages::WebPageProxy::LogDiagnosticMessage::name()
- || decoder.messageName() == Messages::WebPageProxy::LogDiagnosticMessageWithEnhancedPrivacy::name()
- || decoder.messageName() == Messages::WebPageProxy::LogDiagnosticMessageWithValueDictionary::name()
|| decoder.messageName() == Messages::WebPageProxy::SetNetworkRequestsInProgress::name()
|| decoder.messageName() == Messages::WebPageProxy::WillGoToBackForwardListItem::name()
#if USE(QUICK_LOOK)
@@ -450,6 +470,21 @@
}
#endif
+ if (decoder.messageName() == Messages::WebPageProxy::LogDiagnosticMessageFromWebProcess::name()) {
+ IPC::handleMessage<Messages::WebPageProxy::LogDiagnosticMessageFromWebProcess>(decoder, this, &ProvisionalPageProxy::logDiagnosticMessageFromWebProcess);
+ return;
+ }
+
+ if (decoder.messageName() == Messages::WebPageProxy::LogDiagnosticMessageWithEnhancedPrivacyFromWebProcess::name()) {
+ IPC::handleMessage<Messages::WebPageProxy::LogDiagnosticMessageWithEnhancedPrivacyFromWebProcess>(decoder, this, &ProvisionalPageProxy::logDiagnosticMessageWithEnhancedPrivacyFromWebProcess);
+ return;
+ }
+
+ if (decoder.messageName() == Messages::WebPageProxy::LogDiagnosticMessageWithValueDictionaryFromWebProcess::name()) {
+ IPC::handleMessage<Messages::WebPageProxy::LogDiagnosticMessageWithValueDictionaryFromWebProcess>(decoder, this, &ProvisionalPageProxy::logDiagnosticMessageWithValueDictionaryFromWebProcess);
+ return;
+ }
+
if (decoder.messageName() == Messages::WebPageProxy::StartURLSchemeTask::name()) {
IPC::handleMessage<Messages::WebPageProxy::StartURLSchemeTask>(decoder, this, &ProvisionalPageProxy::startURLSchemeTask);
return;
Modified: trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.h (275860 => 275861)
--- trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.h 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.h 2021-04-13 04:57:38 UTC (rev 275861)
@@ -131,6 +131,9 @@
void didStartProvisionalLoadForFrame(WebCore::FrameIdentifier, FrameInfoData&&, WebCore::ResourceRequest&&, uint64_t navigationID, URL&&, URL&& unreachableURL, const UserData&);
void didCommitLoadForFrame(WebCore::FrameIdentifier, FrameInfoData&&, WebCore::ResourceRequest&&, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, WebCore::FrameLoadType, const WebCore::CertificateInfo&, bool usedLegacyTLS, bool containsPluginDocument, Optional<WebCore::HasInsecureContent> forcedHasInsecureContent, WebCore::MouseEventPolicy, const UserData&);
void didFailProvisionalLoadForFrame(WebCore::FrameIdentifier, FrameInfoData&&, WebCore::ResourceRequest&&, uint64_t navigationID, const String& provisionalURL, const WebCore::ResourceError&, WebCore::WillContinueLoading, const UserData&);
+ void logDiagnosticMessageFromWebProcess(const String& message, const String& description, WebCore::ShouldSample);
+ void logDiagnosticMessageWithEnhancedPrivacyFromWebProcess(const String& message, const String& description, WebCore::ShouldSample);
+ void logDiagnosticMessageWithValueDictionaryFromWebProcess(const String& message, const String& description, const WebCore::DiagnosticLoggingClient::ValueDictionary&, WebCore::ShouldSample);
void startURLSchemeTask(URLSchemeTaskParameters&&);
void backForwardGoToItem(const WebCore::BackForwardItemIdentifier&, CompletionHandler<void(const WebBackForwardListCounts&)>&&);
void decidePolicyForNavigationActionSync(WebCore::FrameIdentifier, bool isMainFrame, FrameInfoData&&, WebCore::PolicyCheckIdentifier, uint64_t navigationID, NavigationActionData&&, FrameInfoData&& originatingFrameInfo,
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (275860 => 275861)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-04-13 04:57:38 UTC (rev 275861)
@@ -7215,6 +7215,13 @@
effectiveClient->logDiagnosticMessage(this, message, description);
}
+void WebPageProxy::logDiagnosticMessageFromWebProcess(const String& message, const String& description, WebCore::ShouldSample shouldSample)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ logDiagnosticMessage(message, description, shouldSample);
+}
+
void WebPageProxy::logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result, WebCore::ShouldSample shouldSample)
{
auto* effectiveClient = effectiveDiagnosticLoggingClient(shouldSample);
@@ -7224,6 +7231,13 @@
effectiveClient->logDiagnosticMessageWithResult(this, message, description, static_cast<WebCore::DiagnosticLoggingResultType>(result));
}
+void WebPageProxy::logDiagnosticMessageWithResultFromWebProcess(const String& message, const String& description, uint32_t result, WebCore::ShouldSample shouldSample)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ logDiagnosticMessageWithResult(message, description, result, shouldSample);
+}
+
void WebPageProxy::logDiagnosticMessageWithValue(const String& message, const String& description, double value, unsigned significantFigures, ShouldSample shouldSample)
{
auto* effectiveClient = effectiveDiagnosticLoggingClient(shouldSample);
@@ -7233,6 +7247,13 @@
effectiveClient->logDiagnosticMessageWithValue(this, message, description, String::numberToStringFixedPrecision(value, significantFigures));
}
+void WebPageProxy::logDiagnosticMessageWithValueFromWebProcess(const String& message, const String& description, double value, unsigned significantFigures, ShouldSample shouldSample)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ logDiagnosticMessageWithValue(message, description, value, significantFigures, shouldSample);
+}
+
void WebPageProxy::logDiagnosticMessageWithEnhancedPrivacy(const String& message, const String& description, ShouldSample shouldSample)
{
auto* effectiveClient = effectiveDiagnosticLoggingClient(shouldSample);
@@ -7242,6 +7263,13 @@
effectiveClient->logDiagnosticMessageWithEnhancedPrivacy(this, message, description);
}
+void WebPageProxy::logDiagnosticMessageWithEnhancedPrivacyFromWebProcess(const String& message, const String& description, WebCore::ShouldSample shouldSample)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ logDiagnosticMessageWithEnhancedPrivacy(message, description, shouldSample);
+}
+
void WebPageProxy::logDiagnosticMessageWithValueDictionary(const String& message, const String& description, const WebCore::DiagnosticLoggingClient::ValueDictionary& valueDictionary, WebCore::ShouldSample shouldSample)
{
auto* effectiveClient = effectiveDiagnosticLoggingClient(shouldSample);
@@ -7263,6 +7291,13 @@
effectiveClient->logDiagnosticMessageWithValueDictionary(this, message, description, WTFMove(apiDictionary));
}
+void WebPageProxy::logDiagnosticMessageWithValueDictionaryFromWebProcess(const String& message, const String& description, const WebCore::DiagnosticLoggingClient::ValueDictionary& valueDictionary, WebCore::ShouldSample shouldSample)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ logDiagnosticMessageWithValueDictionary(message, description, valueDictionary, shouldSample);
+}
+
void WebPageProxy::logDiagnosticMessageWithDomain(const String& message, WebCore::DiagnosticLoggingDomain domain)
{
auto* effectiveClient = effectiveDiagnosticLoggingClient(ShouldSample::No);
@@ -7272,6 +7307,13 @@
effectiveClient->logDiagnosticMessageWithDomain(this, message, domain);
}
+void WebPageProxy::logDiagnosticMessageWithDomainFromWebProcess(const String& message, WebCore::DiagnosticLoggingDomain domain)
+{
+ MESSAGE_CHECK(m_process, message.isAllASCII());
+
+ logDiagnosticMessageWithDomain(message, domain);
+}
+
void WebPageProxy::logScrollingEvent(uint32_t eventType, MonotonicTime timestamp, uint64_t data)
{
PerformanceLoggingClient::ScrollingEvent event = static_cast<PerformanceLoggingClient::ScrollingEvent>(eventType);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (275860 => 275861)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-04-13 04:57:38 UTC (rev 275861)
@@ -1533,6 +1533,13 @@
void logDiagnosticMessageWithValueDictionary(const String& message, const String& description, const WebCore::DiagnosticLoggingClient::ValueDictionary&, WebCore::ShouldSample);
void logDiagnosticMessageWithDomain(const String& message, WebCore::DiagnosticLoggingDomain);
+ void logDiagnosticMessageFromWebProcess(const String& message, const String& description, WebCore::ShouldSample);
+ void logDiagnosticMessageWithResultFromWebProcess(const String& message, const String& description, uint32_t result, WebCore::ShouldSample);
+ void logDiagnosticMessageWithValueFromWebProcess(const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample);
+ void logDiagnosticMessageWithEnhancedPrivacyFromWebProcess(const String& message, const String& description, WebCore::ShouldSample);
+ void logDiagnosticMessageWithValueDictionaryFromWebProcess(const String& message, const String& description, const WebCore::DiagnosticLoggingClient::ValueDictionary&, WebCore::ShouldSample);
+ void logDiagnosticMessageWithDomainFromWebProcess(const String& message, WebCore::DiagnosticLoggingDomain);
+
// Performance logging.
void logScrollingEvent(uint32_t eventType, MonotonicTime, uint64_t);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (275860 => 275861)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-04-13 04:57:38 UTC (rev 275861)
@@ -206,12 +206,12 @@
ExecuteUndoRedo(enum:bool WebKit::UndoOrRedo undoOrRedo) -> () Synchronous
# Diagnostic messages logging
- LogDiagnosticMessage(String message, String description, enum:bool WebCore::ShouldSample shouldSample)
- LogDiagnosticMessageWithResult(String message, String description, uint32_t result, enum:bool WebCore::ShouldSample shouldSample)
- LogDiagnosticMessageWithValue(String message, String description, double value, unsigned significantFigures, enum:bool WebCore::ShouldSample shouldSample)
- LogDiagnosticMessageWithEnhancedPrivacy(String message, String description, enum:bool WebCore::ShouldSample shouldSample)
- LogDiagnosticMessageWithValueDictionary(String message, String description, WebCore::DiagnosticLoggingClient::ValueDictionary value, enum:bool WebCore::ShouldSample shouldSample)
- LogDiagnosticMessageWithDomain(String message, WebCore::DiagnosticLoggingDomain domain)
+ LogDiagnosticMessageFromWebProcess(String message, String description, enum:bool WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithResultFromWebProcess(String message, String description, uint32_t result, enum:bool WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithValueFromWebProcess(String message, String description, double value, unsigned significantFigures, enum:bool WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithEnhancedPrivacyFromWebProcess(String message, String description, enum:bool WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithValueDictionaryFromWebProcess(String message, String description, WebCore::DiagnosticLoggingClient::ValueDictionary value, enum:bool WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithDomainFromWebProcess(String message, WebCore::DiagnosticLoggingDomain domain)
# Performance logging
LogScrollingEvent(uint32_t eventType, MonotonicTime timestamp, uint64_t data)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp (275860 => 275861)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2021-04-13 04:43:02 UTC (rev 275860)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2021-04-13 04:57:38 UTC (rev 275861)
@@ -50,7 +50,7 @@
if (!shouldLogAfterSampling(shouldSample))
return;
- m_page.send(Messages::WebPageProxy::LogDiagnosticMessage(message, description, ShouldSample::No));
+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageFromWebProcess(message, description, ShouldSample::No));
}
void WebDiagnosticLoggingClient::logDiagnosticMessageWithResult(const String& message, const String& description, WebCore::DiagnosticLoggingResultType result, WebCore::ShouldSample shouldSample)
@@ -60,7 +60,7 @@
if (!shouldLogAfterSampling(shouldSample))
return;
- m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithResult(message, description, result, ShouldSample::No));
+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithResultFromWebProcess(message, description, result, ShouldSample::No));
}
void WebDiagnosticLoggingClient::logDiagnosticMessageWithValue(const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample shouldSample)
@@ -70,7 +70,7 @@
if (!shouldLogAfterSampling(shouldSample))
return;
- m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValue(message, description, value, significantFigures, ShouldSample::No));
+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValueFromWebProcess(message, description, value, significantFigures, ShouldSample::No));
}
void WebDiagnosticLoggingClient::logDiagnosticMessageWithEnhancedPrivacy(const String& message, const String& description, WebCore::ShouldSample shouldSample)
@@ -80,7 +80,7 @@
if (!shouldLogAfterSampling(shouldSample))
return;
- m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithEnhancedPrivacy(message, description, ShouldSample::No));
+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithEnhancedPrivacyFromWebProcess(message, description, ShouldSample::No));
}
void WebDiagnosticLoggingClient::logDiagnosticMessageWithValueDictionary(const String& message, const String& description, const ValueDictionary& value, ShouldSample shouldSample)
@@ -90,7 +90,7 @@
if (!shouldLogAfterSampling(shouldSample))
return;
- m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValueDictionary(message, description, value, ShouldSample::No));
+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValueDictionaryFromWebProcess(message, description, value, ShouldSample::No));
}
void WebDiagnosticLoggingClient::logDiagnosticMessageWithDomain(const String& message, WebCore::DiagnosticLoggingDomain domain)
@@ -97,7 +97,7 @@
{
ASSERT(!m_page.corePage() || m_page.corePage()->settings().diagnosticLoggingEnabled());
- m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithDomain(message, domain));
+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithDomainFromWebProcess(message, domain));
}
} // namespace WebKit
