Chromium Code Reviews| 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 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 84 return DesktopRect(0, 0, width, height); | 84 return DesktopRect(0, 0, width, height); |
| 85 } | 85 } |
| 86 static DesktopRect MakeXYWH(int32_t x, int32_t y, | 86 static DesktopRect MakeXYWH(int32_t x, int32_t y, |
| 87 int32_t width, int32_t height) { | 87 int32_t width, int32_t height) { |
| 88 return DesktopRect(x, y, x + width, y + height); | 88 return DesktopRect(x, y, x + width, y + height); |
| 89 } | 89 } |
| 90 static DesktopRect MakeLTRB(int32_t left, int32_t top, | 90 static DesktopRect MakeLTRB(int32_t left, int32_t top, |
| 91 int32_t right, int32_t bottom) { | 91 int32_t right, int32_t bottom) { |
| 92 return DesktopRect(left, top, right, bottom); | 92 return DesktopRect(left, top, right, bottom); |
| 93 } | 93 } |
| 94 static DesktopRect MakeLTRB(DesktopVector top_left, | |
| 95 DesktopVector right_bottom) { | |
|
Jamie
2016/08/26 22:29:09
I don't think you're using this, and I'm not convi
Hzj_jie
2016/08/29 21:57:28
Sorry, both this change and DesktopFrame::GetPosAt
| |
| 96 return DesktopRect(top_left.x(), top_left.y(), right_bottom.x(), | |
| 97 right_bottom.y()); | |
| 98 } | |
| 94 static DesktopRect MakeOriginSize(const DesktopVector& origin, | 99 static DesktopRect MakeOriginSize(const DesktopVector& origin, |
| 95 const DesktopSize& size) { | 100 const DesktopSize& size) { |
| 96 return MakeXYWH(origin.x(), origin.y(), size.width(), size.height()); | 101 return MakeXYWH(origin.x(), origin.y(), size.width(), size.height()); |
| 97 } | 102 } |
| 98 | 103 |
| 99 DesktopRect() : left_(0), top_(0), right_(0), bottom_(0) {} | 104 DesktopRect() : left_(0), top_(0), right_(0), bottom_(0) {} |
| 100 | 105 |
| 101 int32_t left() const { return left_; } | 106 int32_t left() const { return left_; } |
| 102 int32_t top() const { return top_; } | 107 int32_t top() const { return top_; } |
| 103 int32_t right() const { return right_; } | 108 int32_t right() const { return right_; } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 int32_t left_; | 141 int32_t left_; |
| 137 int32_t top_; | 142 int32_t top_; |
| 138 int32_t right_; | 143 int32_t right_; |
| 139 int32_t bottom_; | 144 int32_t bottom_; |
| 140 }; | 145 }; |
| 141 | 146 |
| 142 } // namespace webrtc | 147 } // namespace webrtc |
| 143 | 148 |
| 144 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ | 149 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ |
| 145 | 150 |
| OLD | NEW |