projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
webrtc
/
modules
/
desktop_capture
/
desktop_geometry.h
diff --git
a/src/third_party/webrtc/modules/desktop_capture/desktop_geometry.h
b/src/third_party/webrtc/modules/desktop_capture/desktop_geometry.h
index
e51273d
..
b469d3b
100644
(file)
--- a/
src/third_party/webrtc/modules/desktop_capture/desktop_geometry.h
+++ b/
src/third_party/webrtc/modules/desktop_capture/desktop_geometry.h
@@
-58,7
+58,7
@@
class DesktopSize {
int32_t width() const { return width_; }
int32_t height() const { return height_; }
int32_t width() const { return width_; }
int32_t height() const { return height_; }
- bool is_empty() const { return width_ <= 0
&&
height_ <= 0; }
+ bool is_empty() const { return width_ <= 0
||
height_ <= 0; }
bool equals(const DesktopSize& other) const {
return width_ == other.width_ && height_ == other.height_;
bool equals(const DesktopSize& other) const {
return width_ == other.width_ && height_ == other.height_;