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

Side by Side Diff: content/browser/renderer_host/media/desktop_capture_device_aura.cc

Issue 140633004: Reland CL to implement browser-side logging to WebRtc log. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: These are the changes that should fix crbug.com/338848 Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/renderer_host/media/desktop_capture_device_aura.h" 5 #include "content/browser/renderer_host/media/desktop_capture_device_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/timer/timer.h" 8 #include "base/timer/timer.h"
9 #include "cc/output/copy_output_request.h" 9 #include "cc/output/copy_output_request.h"
10 #include "cc/output/copy_output_result.h" 10 #include "cc/output/copy_output_result.h"
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // Post task to update capture size on UI thread. 398 // Post task to update capture size on UI thread.
399 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind( 399 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
400 &DesktopVideoCaptureMachine::UpdateCaptureSize, AsWeakPtr())); 400 &DesktopVideoCaptureMachine::UpdateCaptureSize, AsWeakPtr()));
401 } 401 }
402 402
403 void DesktopVideoCaptureMachine::OnWindowDestroyed(aura::Window* window) { 403 void DesktopVideoCaptureMachine::OnWindowDestroyed(aura::Window* window) {
404 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 404 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
405 405
406 Stop(base::Bind(&base::DoNothing)); 406 Stop(base::Bind(&base::DoNothing));
407 407
408 oracle_proxy_->ReportError(); 408 oracle_proxy_->ReportError("OnWindowDestroyed()");
409 } 409 }
410 410
411 void DesktopVideoCaptureMachine::OnCompositingEnded( 411 void DesktopVideoCaptureMachine::OnCompositingEnded(
412 ui::Compositor* compositor) { 412 ui::Compositor* compositor) {
413 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind( 413 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
414 &DesktopVideoCaptureMachine::Capture, AsWeakPtr(), true)); 414 &DesktopVideoCaptureMachine::Capture, AsWeakPtr(), true));
415 } 415 }
416 416
417 } // namespace 417 } // namespace
418 418
(...skipping 17 matching lines...) Expand all
436 scoped_ptr<Client> client) { 436 scoped_ptr<Client> client) {
437 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString(); 437 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();
438 impl_->AllocateAndStart(params, client.Pass()); 438 impl_->AllocateAndStart(params, client.Pass());
439 } 439 }
440 440
441 void DesktopCaptureDeviceAura::StopAndDeAllocate() { 441 void DesktopCaptureDeviceAura::StopAndDeAllocate() {
442 impl_->StopAndDeAllocate(); 442 impl_->StopAndDeAllocate();
443 } 443 }
444 444
445 } // namespace content 445 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698