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

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

Issue 1896953004: Roll chromium_revision 212f976fef..61ed337cfe (387882:388120) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix Clang warnings Created 4 years, 8 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
(...skipping 29 matching lines...) Expand all
40 40
41 int32_t left; 41 int32_t left;
42 int32_t right; 42 int32_t right;
43 }; 43 };
44 44
45 typedef std::vector<RowSpan> RowSpanSet; 45 typedef std::vector<RowSpan> RowSpanSet;
46 46
47 // Row represents a single row of a region. A row is set of rectangles that 47 // Row represents a single row of a region. A row is set of rectangles that
48 // have the same vertical position. 48 // have the same vertical position.
49 struct Row { 49 struct Row {
50 Row(const Row&);
kwiberg-webrtc 2016/04/19 09:21:02 This class has a std::vector member variable, so p
50 Row(int32_t top, int32_t bottom); 51 Row(int32_t top, int32_t bottom);
51 ~Row(); 52 ~Row();
52 53
53 int32_t top; 54 int32_t top;
54 int32_t bottom; 55 int32_t bottom;
55 56
56 RowSpanSet spans; 57 RowSpanSet spans;
57 }; 58 };
58 59
59 // Type used to store list of rows in the region. The bottom position of row 60 // Type used to store list of rows in the region. The bottom position of row
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // merged row. 159 // merged row.
159 void MergeWithPrecedingRow(Rows::iterator row); 160 void MergeWithPrecedingRow(Rows::iterator row);
160 161
161 Rows rows_; 162 Rows rows_;
162 }; 163 };
163 164
164 } // namespace webrtc 165 } // namespace webrtc
165 166
166 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ 167 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_
167 168
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698