Modified: tags/Safari-604.1.28.1.2/Source/WebKit2/ChangeLog (219168 => 219169)
--- tags/Safari-604.1.28.1.2/Source/WebKit2/ChangeLog 2017-07-05 23:54:03 UTC (rev 219168)
+++ tags/Safari-604.1.28.1.2/Source/WebKit2/ChangeLog 2017-07-05 23:56:24 UTC (rev 219169)
@@ -1,3 +1,7 @@
+2017-07-05 Jason Marcell <jmarc...@apple.com>
+
+ Revert r218821. rdar://problem/33144483
+
2017-06-29 Jason Marcell <jmarc...@apple.com>
Revert r218757. rdar://problem/32911535
Modified: tags/Safari-604.1.28.1.2/Source/WebKit2/UIProcess/WebPageProxy.cpp (219168 => 219169)
--- tags/Safari-604.1.28.1.2/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-07-05 23:54:03 UTC (rev 219168)
+++ tags/Safari-604.1.28.1.2/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-07-05 23:56:24 UTC (rev 219169)
@@ -562,8 +562,7 @@
void WebPageProxy::setDiagnosticLoggingClient(std::unique_ptr<API::DiagnosticLoggingClient>&& diagnosticLoggingClient)
{
- // Diagnostic logging is disabled for ephemeral sessions for privacy reasons.
- if (sessionID().isEphemeral() || !diagnosticLoggingClient) {
+ if (!diagnosticLoggingClient) {
m_diagnosticLoggingClient = std::make_unique<API::DiagnosticLoggingClient>();
return;
}
@@ -5149,7 +5148,7 @@
if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
return;
- diagnosticLoggingClient().logDiagnosticMessage(this, message, description);
+ m_diagnosticLoggingClient->logDiagnosticMessage(this, message, description);
}
void WebPageProxy::logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result, WebCore::ShouldSample shouldSample)
@@ -5157,7 +5156,7 @@
if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
return;
- diagnosticLoggingClient().logDiagnosticMessageWithResult(this, message, description, static_cast<WebCore::DiagnosticLoggingResultType>(result));
+ m_diagnosticLoggingClient->logDiagnosticMessageWithResult(this, message, description, static_cast<WebCore::DiagnosticLoggingResultType>(result));
}
void WebPageProxy::logDiagnosticMessageWithValue(const String& message, const String& description, double value, unsigned significantFigures, ShouldSample shouldSample)
@@ -5165,7 +5164,7 @@
if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
return;
- diagnosticLoggingClient().logDiagnosticMessageWithValue(this, message, description, String::number(value, significantFigures));
+ m_diagnosticLoggingClient->logDiagnosticMessageWithValue(this, message, description, String::number(value, significantFigures));
}
void WebPageProxy::logDiagnosticMessageWithEnhancedPrivacy(const String& message, const String& description, ShouldSample shouldSample)
@@ -5173,7 +5172,7 @@
if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
return;
- diagnosticLoggingClient().logDiagnosticMessageWithEnhancedPrivacy(this, message, description);
+ m_diagnosticLoggingClient->logDiagnosticMessageWithEnhancedPrivacy(this, message, description);
}
void WebPageProxy::logScrollingEvent(uint32_t eventType, MonotonicTime timestamp, uint64_t data)
