Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / desktop_capture / mouse_cursor_monitor_win.cc

diff --git a/src/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc b/src/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc
index 01dace9..1457bf3 100644 (file)
--- a/src/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc
+++ b/src/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc
@@ -13,6 +13,7 @@
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 #include "webrtc/modules/desktop_capture/mouse_cursor.h"
 #include "webrtc/modules/desktop_capture/win/cursor.h"
+#include "webrtc/modules/desktop_capture/win/window_capture_utils.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
@@ -27,6 +28,9 @@ class MouseCursorMonitorWin : public MouseCursorMonitor {
   virtual void Capture() OVERRIDE;
 
  private:
+  // Get the rect of the currently selected screen, relative to the primary
+  // display's top-left. If the screen is disabled or disconnected, or any error
+  // happens, an empty rect is returned.
   DesktopRect GetScreenRect();
 
   HWND window_;
@@ -100,14 +104,18 @@ void MouseCursorMonitorWin::Capture() {
   bool inside = cursor_info.flags == CURSOR_SHOWING;
 
   if (window_) {
-    RECT rect;
-    if (!GetWindowRect(window_, &rect)) {
+    DesktopRect original_rect;
+    DesktopRect cropped_rect;
+    if (!GetCroppedWindowRect(window_, &cropped_rect, &original_rect)) {
       position.set(0, 0);
       inside = false;
     } else {
-      position = position.subtract(DesktopVector(rect.left, rect.top));
-      if (inside)
-        inside = (window_ == WindowFromPoint(cursor_info.ptScreenPos));
+      if (inside) {
+        HWND windowUnderCursor = WindowFromPoint(cursor_info.ptScreenPos);
+        inside = windowUnderCursor ?
+            (window_ == GetAncestor(windowUnderCursor, GA_ROOT)) : false;
+      }
+      position = position.subtract(cropped_rect.top_left());
     }
   } else {
     assert(screen_ != kInvalidScreenId);
@@ -143,11 +151,10 @@ DesktopRect MouseCursorMonitorWin::GetScreenRect() {
   if (!result)
     return DesktopRect();
 
-  return DesktopRect::MakeXYWH(
-      GetSystemMetrics(SM_XVIRTUALSCREEN) + device_mode.dmPosition.x,
-      GetSystemMetrics(SM_YVIRTUALSCREEN) + device_mode.dmPosition.y,
-      device_mode.dmPelsWidth,
-      device_mode.dmPelsHeight);
+  return DesktopRect::MakeXYWH(device_mode.dmPosition.x,
+                               device_mode.dmPosition.y,
+                               device_mode.dmPelsWidth,
+                               device_mode.dmPelsHeight);
 }
 
 MouseCursorMonitor* MouseCursorMonitor::CreateForWindow(