desktop_capture: crop border in window_capture on Win8/10

webrtc/modules/desktop_capture/win/window_capture_utils.cc

 /*
  *  Copyright (c) 2014 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.
  */
 
 #include "webrtc/modules/desktop_capture/win/window_capture_utils.h"
+#include "webrtc/base/win32.h"

[Do not use (sergeyu), 2017/07/06 20:35:49]

add empty line here.
https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes

[Do not use (sergeyu), 2017/07/06 20:35:49]

I think you want to include webrtc/rtc_base/win32.h . webrtc/base/win32.h is
deprecated

[braveyao1, 2017/07/06 22:10:47]

Done.

[braveyao1, 2017/07/06 22:10:47]

Done.

 
 namespace webrtc {
 
 bool
 GetCroppedWindowRect(HWND window,
                      DesktopRect* cropped_rect,
                      DesktopRect* original_rect) {
   RECT rect;
   if (!GetWindowRect(window, &rect)) {
     return false;
   }
   WINDOWPLACEMENT window_placement;
   window_placement.length = sizeof(window_placement);
   if (!GetWindowPlacement(window, &window_placement)) {
     return false;
   }
 
   *original_rect = DesktopRect::MakeLTRB(
       rect.left, rect.top, rect.right, rect.bottom);
 
-  if (window_placement.showCmd == SW_SHOWMAXIMIZED) {
+  if (rtc::IsWindows8OrLater() ||

[Do not use (sergeyu), 2017/07/06 20:36:37]

Please add a comment here to explain why we want to crop the border only after
win8

[braveyao1, 2017/07/06 22:10:47]

Done.

+      window_placement.showCmd == SW_SHOWMAXIMIZED) {
     DesktopSize border = DesktopSize(GetSystemMetrics(SM_CXSIZEFRAME),
                                      GetSystemMetrics(SM_CYSIZEFRAME));
     *cropped_rect = DesktopRect::MakeLTRB(
         rect.left + border.width(),
         rect.top,

[Do not use (sergeyu), 2017/07/06 20:35:49]

Here we don't crop the top border. Is that the behavior we want on Win8?

[braveyao1, 2017/07/06 22:10:47]

Yes. The top doesn't have that border.

         rect.right - border.width(),
         rect.bottom - border.height());
   } else {
     *cropped_rect = *original_rect;
   }
   return true;
 }
 
 AeroChecker::AeroChecker() : dwmapi_library_(nullptr), func_(nullptr) {
   // Try to load dwmapi.dll dynamically since it is not available on XP.
@@ skipping 12 matching lines @@
 
 bool AeroChecker::IsAeroEnabled() {
   BOOL result = FALSE;
   if (func_) {
     func_(&result);
   }
   return result != FALSE;
 }
 
 }  // namespace webrtc