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

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

Issue 23691066: Hook up WebRTC logging extension API to the underlying functionality. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 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 67e6882298322f3f9d314f0db98964871fd794cf..7d0253d959804e0fac67c6d42e11d407ae3e098d 100644
--- a/chrome/renderer/media/chrome_webrtc_log_message_delegate.cc
+++ b/chrome/renderer/media/chrome_webrtc_log_message_delegate.cc
@@ -13,8 +13,7 @@ ChromeWebRtcLogMessageDelegate::ChromeWebRtcLogMessageDelegate(
const scoped_refptr<base::MessageLoopProxy>& io_message_loop,
WebRtcLoggingMessageFilter* message_filter)
: io_message_loop_(io_message_loop),
- message_filter_(message_filter),
- log_initialized_(false) {
+ message_filter_(message_filter) {
content::InitWebRtcLoggingDelegate(this);
}
@@ -22,17 +21,6 @@ ChromeWebRtcLogMessageDelegate::~ChromeWebRtcLogMessageDelegate() {
DCHECK(CalledOnValidThread());
}
-void ChromeWebRtcLogMessageDelegate::InitLogging(
- const std::string& app_session_id,
- const std::string& app_url) {
- DCHECK(CalledOnValidThread());
-
- if (!log_initialized_) {
- log_initialized_ = true;
- message_filter_->InitLogging(app_session_id, app_url);
- }
-}
-
void ChromeWebRtcLogMessageDelegate::LogMessage(const std::string& message) {
if (!CalledOnValidThread()) {
io_message_loop_->PostTask(
@@ -55,10 +43,11 @@ void ChromeWebRtcLogMessageDelegate::OnFilterRemoved() {
message_filter_ = NULL;
}
-void ChromeWebRtcLogMessageDelegate::OnLogOpened(
+void ChromeWebRtcLogMessageDelegate::OnStartLogging(
base::SharedMemoryHandle handle,
uint32 length) {
DCHECK(CalledOnValidThread());
+ DCHECK(!shared_memory_ && !circular_buffer_);
shared_memory_.reset(new base::SharedMemory(handle, false));
CHECK(shared_memory_->Map(length));
@@ -67,11 +56,16 @@ void ChromeWebRtcLogMessageDelegate::OnLogOpened(
length,
length / 2,
true));
+
+ content::InitWebRtcLogging();
}
-void ChromeWebRtcLogMessageDelegate::OnOpenLogFailed() {
+void ChromeWebRtcLogMessageDelegate::OnStopLogging() {
DCHECK(CalledOnValidThread());
- DLOG(ERROR) << "Could not open log.";
- // TODO(grunell): Implement.
- NOTIMPLEMENTED();
+ DCHECK(shared_memory_ && circular_buffer_);
+
+ circular_buffer_.reset(NULL);
+ shared_memory_.reset(NULL);
+ if (message_filter_)
+ message_filter_->LoggingStopped();
}

Powered by Google App Engine
This is Rietveld 408576698