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

Side by Side Diff: webrtc/modules/desktop_capture/differ.h

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More Windows reverts Created 4 years, 9 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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
11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_H_
13 13
14 #include <memory>
14 #include <vector> 15 #include <vector>
15 16
16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/desktop_capture/desktop_region.h" 17 #include "webrtc/modules/desktop_capture/desktop_region.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 // TODO(sergeyu): Simplify differ now that we are working with DesktopRegion. 21 // TODO(sergeyu): Simplify differ now that we are working with DesktopRegion.
22 // diff_info_ should no longer be needed, as we can put our data directly into 22 // diff_info_ should no longer be needed, as we can put our data directly into
23 // the region that we are calculating. 23 // the region that we are calculating.
24 // http://crbug.com/92379 24 // http://crbug.com/92379
25 // TODO(sergeyu): Rename this class to something more sensible, e.g. 25 // TODO(sergeyu): Rename this class to something more sensible, e.g.
26 // ScreenCaptureFrameDifferencer. 26 // ScreenCaptureFrameDifferencer.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 int height_; 67 int height_;
68 68
69 // Number of bytes for each pixel in source and dest bitmap. 69 // Number of bytes for each pixel in source and dest bitmap.
70 // (Yes, they must match.) 70 // (Yes, they must match.)
71 int bytes_per_pixel_; 71 int bytes_per_pixel_;
72 72
73 // Number of bytes in each row of the image (AKA: stride). 73 // Number of bytes in each row of the image (AKA: stride).
74 int bytes_per_row_; 74 int bytes_per_row_;
75 75
76 // Diff information for each block in the image. 76 // Diff information for each block in the image.
77 rtc::scoped_ptr<bool[]> diff_info_; 77 std::unique_ptr<bool[]> diff_info_;
78 78
79 // Dimensions and total size of diff info array. 79 // Dimensions and total size of diff info array.
80 int diff_info_width_; 80 int diff_info_width_;
81 int diff_info_height_; 81 int diff_info_height_;
82 int diff_info_size_; 82 int diff_info_size_;
83 83
84 RTC_DISALLOW_COPY_AND_ASSIGN(Differ); 84 RTC_DISALLOW_COPY_AND_ASSIGN(Differ);
85 }; 85 };
86 86
87 } // namespace webrtc 87 } // namespace webrtc
88 88
89 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_H_ 89 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698