Bug Fix: Tab Capture Mouse Pointer Off On Mac

content/browser/media/capture/cursor_renderer_mac.mm

 // Copyright 2016 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 "content/browser/media/capture/cursor_renderer_mac.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <stdint.h>
@@ skipping 43 matching lines @@
   last_mouse_location_y_ = 0;
   last_mouse_movement_timestamp_ = base::TimeTicks();
 }
 
 // Polls mouse cursor location and image and returns whether the mouse
 // cursor should be rendered on the frame.
 bool CursorRendererMac::SnapshotCursorState(const gfx::Rect& region_in_frame) {
   // Mouse location in window co-ordinates.
   NSPoint mouse_window_location =
       [view_ window].mouseLocationOutsideOfEventStream;
+  // Mouse location with respect to the web contents.
+  NSPoint mouse_tab_location =
+      [view_ convertPoint:mouse_window_location fromView:nil];
 
   // Mouse co-ordinates directly comparable against frame co-ordinates
   // after translation.
-  if (mouse_window_location.x < 0 || mouse_window_location.y < 0 ||
-      mouse_window_location.x > region_in_frame.width() ||
-      mouse_window_location.y > region_in_frame.height()) {
+  if (mouse_tab_location.x < 0 || mouse_tab_location.y < 0 ||
+      mouse_tab_location.x > region_in_frame.width() ||
+      mouse_tab_location.y > region_in_frame.height()) {
     VLOG(2) << "Mouse outside content region";
     return false;
   }
 
   if (![[view_ window] isKeyWindow]) {
     VLOG(2) << "Window currently inactive";
     return false;
   }
 
   if ((base::TimeTicks::Now() - last_mouse_movement_timestamp_).InSeconds() >
           MAX_IDLE_TIME_SECONDS &&
-      std::abs(mouse_window_location.x - last_mouse_location_x_) <
+      std::abs(mouse_tab_location.x - last_mouse_location_x_) <
           MIN_MOVEMENT_PIXELS &&
-      std::abs(mouse_window_location.y - last_mouse_location_y_) <
+      std::abs(mouse_tab_location.y - last_mouse_location_y_) <
           MIN_MOVEMENT_PIXELS) {
     VLOG(2) << "No mouse movement in a while";
     return false;
   }
 
   // Mouse cursor position within the frame.
   cursor_position_in_frame_ =
-      gfx::Point(region_in_frame.x() + mouse_window_location.x,
-                 region_in_frame.y() + mouse_window_location.y);
+      gfx::Point(region_in_frame.x() + mouse_tab_location.x,
+                 region_in_frame.y() + mouse_tab_location.y);
 
   // Grab system cursor.
   NSCursor* nscursor = [NSCursor currentSystemCursor];
   NSPoint nshotspot = [nscursor hotSpot];
   NSImage* nsimage = [nscursor image];
   NSSize nssize = [nsimage size];
 
   // The cursor co-ordinates in the window and the video frame co-ordinates are
   // inverted along y-axis. We render the cursor inverse vertically on the
   // frame. Hence the inversion on hotspot offset here.
@@ skipping 13 matching lines @@
       CGImageGetBitsPerComponent(cg_image) != 8) {
     return false;
   }
 
   CGDataProviderRef provider = CGImageGetDataProvider(cg_image);
   CFDataRef image_data_ref = CGDataProviderCopyData(provider);
   if (!image_data_ref)
     return false;
   last_cursor_data_.reset(image_data_ref, base::scoped_policy::ASSUME);
 
-  if (std::abs(mouse_window_location.x - last_mouse_location_x_) >
+  if (std::abs(mouse_tab_location.x - last_mouse_location_x_) >
           MIN_MOVEMENT_PIXELS ||
-      std::abs(mouse_window_location.y - last_mouse_location_y_) >
+      std::abs(mouse_tab_location.y - last_mouse_location_y_) >
           MIN_MOVEMENT_PIXELS) {
     last_mouse_movement_timestamp_ = base::TimeTicks::Now();
-    last_mouse_location_x_ = mouse_window_location.x;
-    last_mouse_location_y_ = mouse_window_location.y;
+    last_mouse_location_x_ = mouse_tab_location.x;
+    last_mouse_location_y_ = mouse_tab_location.y;
   }
   return true;
 }
 
 // Helper function to composite a RGBA cursor bitmap on a YUV420 video frame.
 void CursorRendererMac::RenderOnVideoFrame(
     const scoped_refptr<media::VideoFrame>& target) const {
   DCHECK(target);
   DCHECK(last_cursor_data_);
   const uint8_t* cursor_data_ =
@@ skipping 37 matching lines @@
         int color_v = clip_byte(
             ((color_r * 112 + color_g * -94 + color_b * -18 + 128) >> 8) + 128);
         uplane[x / 2] = alpha_blend(alpha, color_u, uplane[x / 2]);
         vplane[x / 2] = alpha_blend(alpha, color_v, vplane[x / 2]);
       }
     }
   }
 }
 
 }  // namespace content