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

Side by Side Diff: remoting/host/shaped_desktop_capturer.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "remoting/host/shaped_desktop_capturer.h" 5 #include "remoting/host/shaped_desktop_capturer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "remoting/host/desktop_shape_tracker.h" 8 #include "remoting/host/desktop_shape_tracker.h"
9 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" 9 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
10 10
11 namespace remoting { 11 namespace remoting {
12 12
13 ShapedDesktopCapturer::ShapedDesktopCapturer( 13 ShapedDesktopCapturer::ShapedDesktopCapturer(
14 scoped_ptr<webrtc::DesktopCapturer> desktop_capturer, 14 scoped_ptr<webrtc::DesktopCapturer> desktop_capturer,
15 scoped_ptr<DesktopShapeTracker> shape_tracker) 15 scoped_ptr<DesktopShapeTracker> shape_tracker)
16 : desktop_capturer_(desktop_capturer.Pass()), 16 : desktop_capturer_(desktop_capturer.Pass()),
17 shape_tracker_(shape_tracker.Pass()), 17 shape_tracker_(shape_tracker.Pass()),
18 callback_(NULL) { 18 callback_(nullptr) {
19 } 19 }
20 20
21 ShapedDesktopCapturer::~ShapedDesktopCapturer() {} 21 ShapedDesktopCapturer::~ShapedDesktopCapturer() {}
22 22
23 void ShapedDesktopCapturer::Start(webrtc::DesktopCapturer::Callback* callback) { 23 void ShapedDesktopCapturer::Start(webrtc::DesktopCapturer::Callback* callback) {
24 callback_ = callback; 24 callback_ = callback;
25 desktop_capturer_->Start(this); 25 desktop_capturer_->Start(this);
26 } 26 }
27 27
28 void ShapedDesktopCapturer::Capture(const webrtc::DesktopRegion& region) { 28 void ShapedDesktopCapturer::Capture(const webrtc::DesktopRegion& region) {
29 desktop_capturer_->Capture(region); 29 desktop_capturer_->Capture(region);
30 } 30 }
31 31
32 webrtc::SharedMemory* ShapedDesktopCapturer::CreateSharedMemory(size_t size) { 32 webrtc::SharedMemory* ShapedDesktopCapturer::CreateSharedMemory(size_t size) {
33 return callback_->CreateSharedMemory(size); 33 return callback_->CreateSharedMemory(size);
34 } 34 }
35 35
36 void ShapedDesktopCapturer::OnCaptureCompleted(webrtc::DesktopFrame* frame) { 36 void ShapedDesktopCapturer::OnCaptureCompleted(webrtc::DesktopFrame* frame) {
37 shape_tracker_->RefreshDesktopShape(); 37 shape_tracker_->RefreshDesktopShape();
38 frame->set_shape(new webrtc::DesktopRegion(shape_tracker_->desktop_shape())); 38 frame->set_shape(new webrtc::DesktopRegion(shape_tracker_->desktop_shape()));
39 callback_->OnCaptureCompleted(frame); 39 callback_->OnCaptureCompleted(frame);
40 } 40 }
41 41
42 } // namespace remoting 42 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/setup/win/auth_code_getter.cc ('k') | remoting/host/shaped_desktop_capturer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698