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

Side by Side Diff: webrtc/modules/desktop_capture/cropping_window_capturer_win.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 selected_window_rect.top, 160 selected_window_rect.top,
161 selected_window_rect.right, 161 selected_window_rect.right,
162 selected_window_rect.bottom); 162 selected_window_rect.bottom);
163 163
164 // Get the window region and check if it is rectangular. 164 // Get the window region and check if it is rectangular.
165 win::ScopedGDIObject<HRGN, win::DeleteObjectTraits<HRGN> > 165 win::ScopedGDIObject<HRGN, win::DeleteObjectTraits<HRGN> >
166 scoped_hrgn(CreateRectRgn(0, 0, 0, 0)); 166 scoped_hrgn(CreateRectRgn(0, 0, 0, 0));
167 int region_type = GetWindowRgn(selected, scoped_hrgn.Get()); 167 int region_type = GetWindowRgn(selected, scoped_hrgn.Get());
168 168
169 // Do not use the screen capturer if the region is empty or not rectangular. 169 // Do not use the screen capturer if the region is empty or not rectangular.
170 if (region_type == COMPLEXREGION || region_type == NULLREGION) 170 if (region_type == COMPLEXREGION || region_type == nullptrREGION)
171 return false; 171 return false;
172 172
173 if (region_type == SIMPLEREGION) { 173 if (region_type == SIMPLEREGION) {
174 RECT region_rect; 174 RECT region_rect;
175 GetRgnBox(scoped_hrgn.Get(), &region_rect); 175 GetRgnBox(scoped_hrgn.Get(), &region_rect);
176 DesktopRect rgn_rect = 176 DesktopRect rgn_rect =
177 DesktopRect::MakeLTRB(region_rect.left, 177 DesktopRect::MakeLTRB(region_rect.left,
178 region_rect.top, 178 region_rect.top,
179 region_rect.right, 179 region_rect.right,
180 region_rect.bottom); 180 region_rect.bottom);
(...skipping 29 matching lines...) Expand all
210 } // namespace 210 } // namespace
211 211
212 // static 212 // static
213 std::unique_ptr<DesktopCapturer> CroppingWindowCapturer::CreateCapturer( 213 std::unique_ptr<DesktopCapturer> CroppingWindowCapturer::CreateCapturer(
214 const DesktopCaptureOptions& options) { 214 const DesktopCaptureOptions& options) {
215 return std::unique_ptr<DesktopCapturer>( 215 return std::unique_ptr<DesktopCapturer>(
216 new CroppingWindowCapturerWin(options)); 216 new CroppingWindowCapturerWin(options));
217 } 217 }
218 218
219 } // namespace webrtc 219 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698