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

Side by Side Diff: remoting/host/fake_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
« no previous file with comments | « remoting/host/dns_blackhole_checker.cc ('k') | remoting/host/fake_mouse_cursor_monitor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/fake_desktop_capturer.h" 5 #include "remoting/host/fake_desktop_capturer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 frame->mutable_updated_region()->AddRect(webrtc::DesktopRect::MakeXYWH( 114 frame->mutable_updated_region()->AddRect(webrtc::DesktopRect::MakeXYWH(
115 box_pos_x_, box_pos_y_, kBoxWidth, kBoxHeight)); 115 box_pos_x_, box_pos_y_, kBoxWidth, kBoxHeight));
116 } 116 }
117 117
118 return frame.Pass(); 118 return frame.Pass();
119 } 119 }
120 120
121 } // namespace 121 } // namespace
122 122
123 FakeDesktopCapturer::FakeDesktopCapturer() 123 FakeDesktopCapturer::FakeDesktopCapturer()
124 : callback_(NULL) { 124 : callback_(nullptr) {
125 frame_generator_ = base::Bind(&DefaultFrameGenerator::GenerateFrame, 125 frame_generator_ = base::Bind(&DefaultFrameGenerator::GenerateFrame,
126 new DefaultFrameGenerator()); 126 new DefaultFrameGenerator());
127 } 127 }
128 128
129 FakeDesktopCapturer::~FakeDesktopCapturer() {} 129 FakeDesktopCapturer::~FakeDesktopCapturer() {}
130 130
131 void FakeDesktopCapturer::set_frame_generator( 131 void FakeDesktopCapturer::set_frame_generator(
132 const FrameGenerator& frame_generator) { 132 const FrameGenerator& frame_generator) {
133 DCHECK(!callback_); 133 DCHECK(!callback_);
134 frame_generator_ = frame_generator; 134 frame_generator_ = frame_generator;
135 } 135 }
136 136
137 void FakeDesktopCapturer::Start(Callback* callback) { 137 void FakeDesktopCapturer::Start(Callback* callback) {
138 DCHECK(!callback_); 138 DCHECK(!callback_);
139 DCHECK(callback); 139 DCHECK(callback);
140 callback_ = callback; 140 callback_ = callback;
141 } 141 }
142 142
143 void FakeDesktopCapturer::Capture(const webrtc::DesktopRegion& region) { 143 void FakeDesktopCapturer::Capture(const webrtc::DesktopRegion& region) {
144 base::Time capture_start_time = base::Time::Now(); 144 base::Time capture_start_time = base::Time::Now();
145 scoped_ptr<webrtc::DesktopFrame> frame = frame_generator_.Run(callback_); 145 scoped_ptr<webrtc::DesktopFrame> frame = frame_generator_.Run(callback_);
146 frame->set_capture_time_ms( 146 frame->set_capture_time_ms(
147 (base::Time::Now() - capture_start_time).InMillisecondsRoundedUp()); 147 (base::Time::Now() - capture_start_time).InMillisecondsRoundedUp());
148 callback_->OnCaptureCompleted(frame.release()); 148 callback_->OnCaptureCompleted(frame.release());
149 } 149 }
150 150
151 } // namespace remoting 151 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/dns_blackhole_checker.cc ('k') | remoting/host/fake_mouse_cursor_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698