Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: chrome/renderer/media/chrome_webrtc_log_message_delegate.cc

Issue 218403004: Fix the timestamp generation for webrtc native log. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tommi's comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/media/chrome_webrtc_log_message_delegate.cc
diff --git a/chrome/renderer/media/chrome_webrtc_log_message_delegate.cc b/chrome/renderer/media/chrome_webrtc_log_message_delegate.cc
index cc09c93321f367e580a935332b31051dc4ea66a9..c2d463431f3c78e80fd75d5288897e8d45ceb20b 100644
--- a/chrome/renderer/media/chrome_webrtc_log_message_delegate.cc
+++ b/chrome/renderer/media/chrome_webrtc_log_message_delegate.cc
@@ -23,34 +23,38 @@ ChromeWebRtcLogMessageDelegate::~ChromeWebRtcLogMessageDelegate() {
}
void ChromeWebRtcLogMessageDelegate::LogMessage(const std::string& message) {
+ WebRtcLoggingMessageData data(base::Time::Now(), message);
+
io_message_loop_->PostTask(
FROM_HERE, base::Bind(
&ChromeWebRtcLogMessageDelegate::LogMessageOnIOThread,
base::Unretained(this),
- message));
+ data));
}
void ChromeWebRtcLogMessageDelegate::LogMessageOnIOThread(
- const std::string& message) {
+ const WebRtcLoggingMessageData& message) {
DCHECK(CalledOnValidThread());
+
if (logging_started_ && message_filter_) {
if (!log_buffer_.empty()) {
// A delayed task has already been posted for sending the buffer contents.
// Just add the message to the buffer.
- log_buffer_ += "\n" + message;
+ log_buffer_.push_back(message);
+ return;
+ }
+
+ log_buffer_.push_back(message);
+
+ if (base::TimeTicks::Now() - last_log_buffer_send_ >
+ base::TimeDelta::FromMilliseconds(100)) {
+ SendLogBuffer();
} else {
- if (base::TimeTicks::Now() - last_log_buffer_send_ >
- base::TimeDelta::FromMilliseconds(100)) {
- log_buffer_ = message;
- SendLogBuffer();
- } else {
- log_buffer_ = message;
- io_message_loop_->PostDelayedTask(
- FROM_HERE,
- base::Bind(&ChromeWebRtcLogMessageDelegate::SendLogBuffer,
- base::Unretained(this)),
- base::TimeDelta::FromMilliseconds(200));
- }
+ io_message_loop_->PostDelayedTask(
+ FROM_HERE,
+ base::Bind(&ChromeWebRtcLogMessageDelegate::SendLogBuffer,
+ base::Unretained(this)),
+ base::TimeDelta::FromMilliseconds(200));
}
}
}
@@ -78,7 +82,7 @@ void ChromeWebRtcLogMessageDelegate::OnStopLogging() {
void ChromeWebRtcLogMessageDelegate::SendLogBuffer() {
DCHECK(CalledOnValidThread());
if (logging_started_ && message_filter_) {
- message_filter_->AddLogMessage(log_buffer_);
+ message_filter_->AddLogMessages(log_buffer_);
last_log_buffer_send_ = base::TimeTicks::Now();
}
log_buffer_.clear();

Powered by Google App Engine
This is Rietveld 408576698