Making EventSender talk to the right WebWidget (for OOPIF support).

components/test_runner/event_sender.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
 #define COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <queue>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebDragOperation.h"
 #include "third_party/WebKit/public/platform/WebInputEventResult.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebTouchPoint.h"
 
 namespace blink {
 class WebLocalFrame;
 class WebView;
+class WebWidget;
 struct WebContextMenuData;
 }
 
 namespace gin {
 class Arguments;
 }
 
 namespace test_runner {
 
 class TestInterfaces;
+class WebFrameTestProxyBase;
 class WebTestDelegate;
-class WebTestProxyBase;
 
 // Key event location code introduced in DOM Level 3.
 // See also: http://www.w3.org/TR/DOM-Level-3-Events/#events-keyboardevents
 enum KeyLocationCode {
   DOMKeyLocationStandard      = 0x00,
   DOMKeyLocationLeft          = 0x01,
   DOMKeyLocationRight         = 0x02,
   DOMKeyLocationNumpad        = 0x03
 };
 
 class EventSender {
  public:
-  explicit EventSender(WebTestProxyBase*);
+  explicit EventSender(WebFrameTestProxyBase*);
   virtual ~EventSender();
 
   void Reset();
   void Install(blink::WebLocalFrame*);
 
   void SetContextMenuData(const blink::WebContextMenuData&);
 
   void DoDragDrop(const blink::WebDragData&, blink::WebDragOperationsMask);
 
   void set_send_wheel_gestures(bool send_wheel_gestures) {
@@ skipping 178 matching lines @@
   int wm_key_down_;
   int wm_key_up_;
   int wm_char_;
   int wm_dead_char_;
   int wm_sys_key_down_;
   int wm_sys_key_up_;
   int wm_sys_char_;
   int wm_sys_dead_char_;
 #endif
 
-  WebTestProxyBase* web_test_proxy_base_;
+  WebFrameTestProxyBase* web_frame_test_proxy_base_;
   TestInterfaces* interfaces();
   WebTestDelegate* delegate();
   const blink::WebView* view() const;
   blink::WebView* view();
+  blink::WebWidget* widget();
 
   bool send_wheel_gestures_;
   bool force_layout_on_events_;
 
   // When set to true (the default value), we batch mouse move and mouse up
   // events so we can simulate drag & drop.
   bool is_drag_mode_;
 
   int touch_modifiers_;
   bool touch_cancelable_;
   std::vector<blink::WebTouchPoint> touch_points_;
 
   std::unique_ptr<blink::WebContextMenuData> last_context_menu_data_;
 
   blink::WebDragData current_drag_data_;
 
   // Location of the touch point that initiated a gesture.
   blink::WebPoint current_gesture_location_;
 
-
   // Mouse-like pointer properties.
   struct PointerState {
       // Last pressed button (Left/Right/Middle or None).
       blink::WebMouseEvent::Button pressed_button_;
 
       // A bitwise OR of the WebMouseEvent::*ButtonDown values corresponding to
       // currently pressed buttons of the pointer (e.g. pen or mouse).
       int current_buttons_;
 
       // Location of last mouseMoveTo event of this pointer.
@@ skipping 32 matching lines @@
   double last_event_timestamp_;
 
   base::WeakPtrFactory<EventSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EventSender);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_