| OLD | NEW |
| 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 #include "webrtc/modules/desktop_capture/desktop_region.h" | 11 #include "webrtc/modules/desktop_capture/desktop_region.h" |
| 12 | 12 |
| 13 #include <assert.h> | 13 #include <assert.h> |
| 14 | 14 |
| 15 #include <algorithm> | 15 #include <algorithm> |
| 16 | 16 |
| 17 namespace webrtc { | 17 namespace webrtc { |
| 18 | 18 |
| 19 DesktopRegion::RowSpan::RowSpan(int32_t left, int32_t right) | 19 DesktopRegion::RowSpan::RowSpan(int32_t left, int32_t right) |
| 20 : left(left), right(right) { | 20 : left(left), right(right) { |
| 21 } | 21 } |
| 22 | 22 |
| 23 DesktopRegion::Row::Row(const Row&) = default; |
| 24 |
| 23 DesktopRegion::Row::Row(int32_t top, int32_t bottom) | 25 DesktopRegion::Row::Row(int32_t top, int32_t bottom) |
| 24 : top(top), bottom(bottom) { | 26 : top(top), bottom(bottom) { |
| 25 } | 27 } |
| 26 | 28 |
| 27 DesktopRegion::Row::~Row() {} | 29 DesktopRegion::Row::~Row() {} |
| 28 | 30 |
| 29 DesktopRegion::DesktopRegion() {} | 31 DesktopRegion::DesktopRegion() {} |
| 30 | 32 |
| 31 DesktopRegion::DesktopRegion(const DesktopRect& rect) { | 33 DesktopRegion::DesktopRegion(const DesktopRect& rect) { |
| 32 AddRect(rect); | 34 AddRect(rect); |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 previous = bottom_row; | 562 previous = bottom_row; |
| 561 ++bottom_row; | 563 ++bottom_row; |
| 562 } while (bottom_row != region_.rows_.end() && | 564 } while (bottom_row != region_.rows_.end() && |
| 563 previous->second->bottom == bottom_row->second->top && | 565 previous->second->bottom == bottom_row->second->top && |
| 564 IsSpanInRow(*bottom_row->second, *row_span_)); | 566 IsSpanInRow(*bottom_row->second, *row_span_)); |
| 565 rect_ = DesktopRect::MakeLTRB(row_span_->left, row_->second->top, | 567 rect_ = DesktopRect::MakeLTRB(row_span_->left, row_->second->top, |
| 566 row_span_->right, bottom); | 568 row_span_->right, bottom); |
| 567 } | 569 } |
| 568 | 570 |
| 569 } // namespace webrtc | 571 } // namespace webrtc |
| OLD | NEW |