Bug Fix: Cursor Stretched During Tab Capturing On Windows

ui/gfx/icon_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/icon_util.h"
 
 #include <memory>
 
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
@@ skipping 293 matching lines @@
 
   ScopedICONINFO icon_info;
   BITMAP bitmap_info = { 0 };
 
   if (!::GetIconInfo(icon, &icon_info))
     return NULL;
 
   if (!::GetObject(icon_info.hbmMask, sizeof(bitmap_info), &bitmap_info))
     return NULL;
 
-  gfx::Size icon_size(bitmap_info.bmWidth, bitmap_info.bmHeight);
+  // For non-color cursors, the mask contains both an AND and an XOR mask and
+  // the height includes both. Thus, the mask width is the same as image width,
+  // but we need to divide mask height by 2 to get the image height.
+  const int height = (icon_info.hbmColor == NULL) ? bitmap_info.bmHeight / 2

[msw, 2016/10/20 18:54:51]

nit: just check: "icon_info.hbmColor ?" otherwise, use nullptr. optionally:
  const int height = bitmap_info.bmHeight / (icon_info.hbmColor ? 2 : 1);

[qiangchen, 2016/10/20 20:03:33]

Done.

[msw, 2016/10/20 20:06:58]

Thanks for catching and fixing the inversion error in my suggested ternary!

+                                                  : bitmap_info.bmHeight;
+  gfx::Size icon_size(bitmap_info.bmWidth, height);
   return new SkBitmap(CreateSkBitmapFromHICONHelper(icon, icon_size));
 }
 
 base::win::ScopedHICON IconUtil::CreateCursorFromDIB(const gfx::Size& icon_size,
                                                      const gfx::Point& hotspot,
                                                      const void* dib_bits,
                                                      size_t dib_size) {
   BITMAPINFO icon_bitmap_info = {};
   skia::CreateBitmapHeader(
       icon_size.width(),
@@ skipping 365 matching lines @@
   // Once we compute the size for a singe AND mask scan line, we multiply that
   // number by the image height in order to get the total number of bytes for
   // the AND mask. Thus, for a 15X15 image, we need 15 * 4 which is 60 bytes
   // for the monochrome bitmap representing the AND mask.
   size_t and_line_length = (bitmap.width() + 7) >> 3;
   and_line_length = (and_line_length + 3) & ~3;
   size_t and_mask_size = and_line_length * bitmap.height();
   size_t masks_size = *xor_mask_size + and_mask_size;
   *bytes_in_resource = masks_size + sizeof(BITMAPINFOHEADER);
 }