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

Side by Side Diff: content/browser/media/webrtc/webrtc_internals.cc

Issue 1855193002: Move the call to enable the WebRTC event log from PeerConnectionFactory to PeerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments by ncarter and grunell. Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/media/webrtc/webrtc_internals.h" 5 #include "content/browser/media/webrtc/webrtc_internals.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "content/browser/media/webrtc/webrtc_internals_ui_observer.h" 11 #include "content/browser/media/webrtc/webrtc_internals_ui_observer.h"
12 #include "content/browser/renderer_host/render_process_host_impl.h"
12 #include "content/browser/web_contents/web_contents_view.h" 13 #include "content/browser/web_contents/web_contents_view.h"
13 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
14 #include "content/public/browser/content_browser_client.h" 15 #include "content/public/browser/content_browser_client.h"
15 #include "content/public/browser/power_save_blocker.h" 16 #include "content/public/browser/power_save_blocker.h"
16 #include "content/public/browser/render_process_host.h"
17 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
18 #include "ipc/ipc_platform_file.h"
19
20 #if defined(OS_WIN)
21 #define IntToStringType base::IntToString16
22 #else
23 #define IntToStringType base::IntToString
24 #endif
18 25
19 using base::ProcessId; 26 using base::ProcessId;
20 using std::string; 27 using std::string;
21 28
22 namespace content { 29 namespace content {
23 30
24 namespace { 31 namespace {
25 32
26 static base::LazyInstance<WebRTCInternals>::Leaky g_webrtc_internals = 33 static base::LazyInstance<WebRTCInternals>::Leaky g_webrtc_internals =
27 LAZY_INSTANCE_INITIALIZER; 34 LAZY_INSTANCE_INITIALIZER;
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 select_file_dialog_ = ui::SelectFileDialog::Create(this, nullptr); 342 select_file_dialog_ = ui::SelectFileDialog::Create(this, nullptr);
336 select_file_dialog_->SelectFile( 343 select_file_dialog_->SelectFile(
337 ui::SelectFileDialog::SELECT_SAVEAS_FILE, base::string16(), 344 ui::SelectFileDialog::SELECT_SAVEAS_FILE, base::string16(),
338 event_log_recordings_file_path_, nullptr, 0, FILE_PATH_LITERAL(""), 345 event_log_recordings_file_path_, nullptr, 0, FILE_PATH_LITERAL(""),
339 web_contents->GetTopLevelNativeWindow(), nullptr); 346 web_contents->GetTopLevelNativeWindow(), nullptr);
340 #endif 347 #endif
341 } else { 348 } else {
342 event_log_recordings_ = false; 349 event_log_recordings_ = false;
343 // Tear down the dialog since the user has unchecked the audio debug 350 // Tear down the dialog since the user has unchecked the audio debug
344 // recordings box. 351 // recordings box.
352 DCHECK(select_file_dialog_->HasOneRef());
345 select_file_dialog_ = nullptr; 353 select_file_dialog_ = nullptr;
346 DCHECK(select_file_dialog_->HasOneRef());
tommi (sloooow) - chröme 2016/05/25 15:16:21 yikes. shows the value of testing with dcheck enab
Ivo-OOO until feb 6 2016/05/30 15:04:15 Indeed.
347 354
348 for (RenderProcessHost::iterator i( 355 for (RenderProcessHost::iterator i(
349 content::RenderProcessHost::AllHostsIterator()); 356 content::RenderProcessHost::AllHostsIterator());
350 !i.IsAtEnd(); i.Advance()) { 357 !i.IsAtEnd(); i.Advance()) {
351 i.GetCurrentValue()->DisableEventLogRecordings(); 358 RenderProcessHostImpl* rph =
359 static_cast<RenderProcessHostImpl*>(i.GetCurrentValue());
tommi (sloooow) - chröme 2016/05/25 15:16:21 this feels hacky. How can you be sure that this i
ncarter (slow) 2016/05/25 21:28:58 As tommi suggests, this is an illegal cast. In con
Ivo-OOO until feb 6 2016/05/30 15:04:15 Good points, removed the cast since it's not neces
360 rph->StopWebRTCEventLog();
352 } 361 }
353 } 362 }
354 #endif 363 #endif
355 } 364 }
356 365
357 bool WebRTCInternals::IsEventLogRecordingsEnabled() const { 366 bool WebRTCInternals::IsEventLogRecordingsEnabled() const {
358 DCHECK_CURRENTLY_ON(BrowserThread::UI); 367 DCHECK_CURRENTLY_ON(BrowserThread::UI);
359 return event_log_recordings_; 368 return event_log_recordings_;
360 } 369 }
361 370
362 const base::FilePath& WebRTCInternals::GetEventLogRecordingsFilePath() const {
363 DCHECK_CURRENTLY_ON(BrowserThread::UI);
364 return event_log_recordings_file_path_;
365 }
366
367 void WebRTCInternals::SendUpdate(const string& command, 371 void WebRTCInternals::SendUpdate(const string& command,
368 std::unique_ptr<base::Value> value) { 372 std::unique_ptr<base::Value> value) {
369 DCHECK_CURRENTLY_ON(BrowserThread::UI); 373 DCHECK_CURRENTLY_ON(BrowserThread::UI);
370 DCHECK(observers_.might_have_observers()); 374 DCHECK(observers_.might_have_observers());
371 375
372 bool queue_was_empty = pending_updates_.empty(); 376 bool queue_was_empty = pending_updates_.empty();
373 pending_updates_.push(PendingUpdate(command, std::move(value))); 377 pending_updates_.push(PendingUpdate(command, std::move(value)));
374 378
375 if (queue_was_empty) { 379 if (queue_was_empty) {
376 BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE, 380 BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 } 483 }
480 } 484 }
481 485
482 void WebRTCInternals::EnableEventLogRecordingsOnAllRenderProcessHosts() { 486 void WebRTCInternals::EnableEventLogRecordingsOnAllRenderProcessHosts() {
483 DCHECK_CURRENTLY_ON(BrowserThread::UI); 487 DCHECK_CURRENTLY_ON(BrowserThread::UI);
484 488
485 event_log_recordings_ = true; 489 event_log_recordings_ = true;
486 for (RenderProcessHost::iterator i( 490 for (RenderProcessHost::iterator i(
487 content::RenderProcessHost::AllHostsIterator()); 491 content::RenderProcessHost::AllHostsIterator());
488 !i.IsAtEnd(); i.Advance()) { 492 !i.IsAtEnd(); i.Advance()) {
489 i.GetCurrentValue()->EnableEventLogRecordings( 493 RenderProcessHostImpl* rph =
490 event_log_recordings_file_path_); 494 static_cast<RenderProcessHostImpl*>(i.GetCurrentValue());
tommi (sloooow) - chröme 2016/05/25 15:16:21 same here
Ivo-OOO until feb 6 2016/05/30 15:04:15 Removed here as well.
495 rph->StartWebRTCEventLog(event_log_recordings_file_path_);
491 } 496 }
492 } 497 }
493 #endif 498 #endif
494 499
495 void WebRTCInternals::CreateOrReleasePowerSaveBlocker() { 500 void WebRTCInternals::CreateOrReleasePowerSaveBlocker() {
496 DCHECK_CURRENTLY_ON(BrowserThread::UI); 501 DCHECK_CURRENTLY_ON(BrowserThread::UI);
497 502
498 if (peer_connection_data_.empty() && power_save_blocker_) { 503 if (peer_connection_data_.empty() && power_save_blocker_) {
499 DVLOG(1) << ("Releasing the block on application suspension since no " 504 DVLOG(1) << ("Releasing the block on application suspension since no "
500 "PeerConnections are active anymore."); 505 "PeerConnections are active anymore.");
(...skipping 12 matching lines...) Expand all
513 while (!pending_updates_.empty()) { 518 while (!pending_updates_.empty()) {
514 const auto& update = pending_updates_.front(); 519 const auto& update = pending_updates_.front();
515 FOR_EACH_OBSERVER(WebRTCInternalsUIObserver, 520 FOR_EACH_OBSERVER(WebRTCInternalsUIObserver,
516 observers_, 521 observers_,
517 OnUpdate(update.command(), update.value())); 522 OnUpdate(update.command(), update.value()));
518 pending_updates_.pop(); 523 pending_updates_.pop();
519 } 524 }
520 } 525 }
521 526
522 } // namespace content 527 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698