DesktopRect::UnionWith() to extend current rect to cover the input rect

webrtc/modules/desktop_capture/desktop_geometry.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 19 matching lines @@
   right_ = std::min(right(), rect.right());
   bottom_ = std::min(bottom(), rect.bottom());
   if (is_empty()) {
     left_ = 0;
     top_ = 0;
     right_ = 0;
     bottom_ = 0;
   }
 }
 
+void DesktopRect::UnionWith(const DesktopRect& rect) {
+  if (is_empty()) {
+    left_ = rect.left();

[Sergey Ulanov, 2017/05/16 19:53:00]

*this = rect;

[Hzj_jie, 2017/05/16 23:04:18]

Done.

+    top_ = rect.top();
+    right_ = rect.right();
+    bottom_ = rect.bottom();
+  } else if (!rect.is_empty()) {

[Sergey Ulanov, 2017/05/16 19:53:00]

I'd prefer to format this function as follows:

  if (is_empty()) {
    *this = rect;
    return;
  }

  if (rect.is_empty())
    return;  

  left_ = std::min(left(), rect.left());
  top_ = std::min(top(), rect.top());
  right_ = std::max(right(), rect.right());
  bottom_ = std::max(bottom(), rect.bottom());

This makes the default case obvious and separates it from the cases when one of
the rects is empty

[Hzj_jie, 2017/05/16 23:04:18]

Done.

+    left_ = std::min(left(), rect.left());
+    top_ = std::min(top(), rect.top());
+    right_ = std::max(right(), rect.right());
+    bottom_ = std::max(bottom(), rect.bottom());
+  }
+}
+
 void DesktopRect::Translate(int32_t dx, int32_t dy) {
   left_ += dx;
   top_ += dy;
   right_ += dx;
   bottom_ += dy;
 }
 
 void DesktopRect::Extend(int32_t left_offset,
                          int32_t top_offset,
                          int32_t right_offset,
                          int32_t bottom_offset) {
   left_ -= left_offset;
   top_ -= top_offset;
   right_ += right_offset;
   bottom_ += bottom_offset;
 }
 
 }  // namespace webrtc