Remove EventExecutor dependency on VideoFrameCapturer.

remoting/host/event_executor_win.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 "remoting/host/event_executor.h"
 
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
-#include "remoting/host/video_frame_capturer.h"
 #include "remoting/host/clipboard.h"
 #include "remoting/proto/event.pb.h"
+// SkSize.h assumes that stdint.h-style types are already defined.
+#include "third_party/skia/include/core/SkTypes.h"
+#include "third_party/skia/include/core/SkSize.h"
 
 namespace remoting {
 
 namespace {
 
 using protocol::ClipboardEvent;
 using protocol::KeyEvent;
 using protocol::MouseEvent;
 
 // USB to XKB keycode map table.
 #define USB_KEYMAP(usb, xkb, win, mac) {usb, win}
 #include "ui/base/keycodes/usb_keycode_map.h"
 #undef USB_KEYMAP
 
 // A class to generate events on Windows.
 class EventExecutorWin : public EventExecutor {
  public:
   EventExecutorWin(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-                   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-                   VideoFrameCapturer* capturer);
+                   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
   virtual ~EventExecutorWin() {}
 
   // ClipboardStub interface.
   virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
 
   // InputStub interface.
   virtual void InjectKeyEvent(const KeyEvent& event) OVERRIDE;
   virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE;
 
   // EventExecutor interface.
   virtual void OnSessionStarted(
       scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
   virtual void OnSessionFinished() OVERRIDE;
 
  private:
   HKL GetForegroundKeyboardLayout();
   void HandleKey(const KeyEvent& event);
   void HandleMouse(const MouseEvent& event);
 
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
-  VideoFrameCapturer* capturer_;
   scoped_ptr<Clipboard> clipboard_;
 
   DISALLOW_COPY_AND_ASSIGN(EventExecutorWin);
 };
 
 EventExecutorWin::EventExecutorWin(
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-    VideoFrameCapturer* capturer)
+    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : main_task_runner_(main_task_runner),
       ui_task_runner_(ui_task_runner),
-      capturer_(capturer),
       clipboard_(Clipboard::Create()) {
 }
 
 void EventExecutorWin::InjectClipboardEvent(const ClipboardEvent& event) {
   if (!ui_task_runner_->BelongsToCurrentThread()) {
     ui_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&EventExecutorWin::InjectClipboardEvent,
                    base::Unretained(this),
                    event));
@@ skipping 134 matching lines @@
 
   // TODO(garykac) Collapse mouse (x,y) and button events into a single
   // input event when possible.
   if (event.has_x() && event.has_y()) {
     int x = event.x();
     int y = event.y();
 
     INPUT input;
     input.type = INPUT_MOUSE;
     input.mi.time = 0;
-    SkISize screen_size = capturer_->size_most_recent();
+    SkISize screen_size(SkISize::Make(GetSystemMetrics(SM_CXVIRTUALSCREEN),
+                                      GetSystemMetrics(SM_CYVIRTUALSCREEN)));
     if ((screen_size.width() > 1) && (screen_size.height() > 1)) {
+      x = std::max(0, std::min(screen_size.width(), x));
+      y = std::max(0, std::min(screen_size.height(), y));
       input.mi.dx = static_cast<int>((x * 65535) / (screen_size.width() - 1));
       input.mi.dy = static_cast<int>((y * 65535) / (screen_size.height() - 1));
       input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
       if (SendInput(1, &input, sizeof(INPUT)) == 0) {
         LOG_GETLASTERROR(ERROR) << "Failed to inject a mouse move event";
       }
     }
   }
 
   if (event.has_wheel_offset_x() && event.has_wheel_offset_y()) {
@@ skipping 46 matching lines @@
     if (SendInput(1, &button_event, sizeof(INPUT)) == 0) {
       LOG_GETLASTERROR(ERROR) << "Failed to inject a mouse button event";
     }
   }
 }
 
 }  // namespace
 
 scoped_ptr<EventExecutor> EventExecutor::Create(
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-    VideoFrameCapturer* capturer) {
+    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   return scoped_ptr<EventExecutor>(
-      new EventExecutorWin(main_task_runner, ui_task_runner, capturer));
+      new EventExecutorWin(main_task_runner, ui_task_runner));
 }
 
 }  // namespace remoting