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

components/test_runner/event_sender.cc

 // 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.
 
 #include "components/test_runner/event_sender.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/test_runner/mock_spell_check.h"
 #include "components/test_runner/test_interfaces.h"
+#include "components/test_runner/web_frame_test_proxy.h"
 #include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
 #include "third_party/WebKit/public/platform/WebPointerProperties.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
@@ skipping 1156 matching lines @@
 
 WebMouseEvent::Button EventSender::last_button_type_ =
     WebMouseEvent::ButtonNone;
 
 EventSender::SavedEvent::SavedEvent()
     : type(TYPE_UNSPECIFIED),
       button_type(WebMouseEvent::ButtonNone),
       milliseconds(0),
       modifiers(0) {}
 
-EventSender::EventSender(WebTestProxyBase* web_test_proxy_base)
-    : web_test_proxy_base_(web_test_proxy_base),
+EventSender::EventSender(
+    WebFrameTestProxyBase* web_frame_test_proxy_base)
+    : web_frame_test_proxy_base_(web_frame_test_proxy_base),
       send_wheel_gestures_(false),
       replaying_saved_events_(false),
       weak_factory_(this) {
   Reset();
 }
 
 EventSender::~EventSender() {}
 
 void EventSender::Reset() {
   DCHECK(current_drag_data_.isNull());
   current_drag_data_.reset();
   current_drag_effect_ = blink::WebDragOperationNone;
   current_drag_effects_allowed_ = blink::WebDragOperationNone;
-  if (view() &&
+  if (widget() &&
       current_pointer_state_[kMousePointerId].pressed_button_ !=
           WebMouseEvent::ButtonNone)
-    view()->mouseCaptureLost();
+    widget()->mouseCaptureLost();
   current_pointer_state_.clear();
   is_drag_mode_ = true;
   force_layout_on_events_ = true;
 
 #if defined(OS_WIN)
   wm_key_down_ = WM_KEYDOWN;
   wm_key_up_ = WM_KEYUP;
   wm_char_ = WM_CHAR;
   wm_dead_char_ = WM_DEADCHAR;
   wm_sys_key_down_ = WM_SYSKEYDOWN;
@@ skipping 63 matching lines @@
   PointerUp(button_number, modifiers,
             blink::WebPointerProperties::PointerType::Mouse, kMousePointerId);
 }
 
 void EventSender::PointerDown(
     int button_number,
     int modifiers,
     blink::WebPointerProperties::PointerType pointerType,
     int pointerId) {
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   DCHECK_NE(-1, button_number);
 
   WebMouseEvent::Button button_type =
       GetButtonTypeFromButtonNumber(button_number);
 
   WebMouseEvent event;
   int click_count = 0;
   current_pointer_state_[pointerId].pressed_button_ = button_type;
   current_pointer_state_[pointerId].current_buttons_ |=
@@ skipping 17 matching lines @@
 
   HandleInputEventOnViewOrPopup(event);
 }
 
 void EventSender::PointerUp(
     int button_number,
     int modifiers,
     blink::WebPointerProperties::PointerType pointerType,
     int pointerId) {
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   DCHECK_NE(-1, button_number);
 
   WebMouseEvent::Button button_type =
       GetButtonTypeFromButtonNumber(button_number);
 
   if (pointerType == blink::WebPointerProperties::PointerType::Mouse &&
       is_drag_mode_ && !replaying_saved_events_) {
     SavedEvent saved_event;
     saved_event.type = SavedEvent::TYPE_MOUSE_UP;
@@ skipping 238 matching lines @@
     event_down.modifiers |= WebInputEvent::IsKeyPad;
     break;
   }
 
   WebKeyboardEvent event_up;
   event_up = event_down;
   event_up.type = WebInputEvent::KeyUp;
   // EventSender.m forces a layout here, with at least one
   // test (fast/forms/focus-control-to-page.html) relying on this.
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   // In the browser, if a keyboard event corresponds to an editor command,
   // the command will be dispatched to the renderer just before dispatching
   // the keyboard event, and then it will be executed in the
   // RenderView::handleCurrentKeyboardEvent() method.
   // We just simulate the same behavior here.
   std::string edit_command;
   if (GetEditCommand(event_down, &edit_command))
     delegate()->SetEditCommand(edit_command, "");
 
@@ skipping 31 matching lines @@
 }
 
 void EventSender::EnableDOMUIEventLogging() {}
 
 void EventSender::FireKeyboardEventsToElement() {}
 
 void EventSender::ClearKillRing() {}
 
 std::vector<std::string> EventSender::ContextClick() {
   if (force_layout_on_events_) {
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
   }
 
   UpdateClickCountForButton(WebMouseEvent::ButtonRight);
 
   // Clears last context menu data because we need to know if the context menu
   // be requested after following mouse events.
   last_context_menu_data_.reset();
 
   // Generate right mouse down and up.
   WebMouseEvent event;
@@ skipping 166 matching lines @@
 void EventSender::GestureFlingCancel() {
   WebGestureEvent event;
   event.type = WebInputEvent::GestureFlingCancel;
   // Generally it won't matter what device we use here, and since it might
   // be cumbersome to expect all callers to specify a device, we'll just
   // choose Touchpad here.
   event.sourceDevice = blink::WebGestureDeviceTouchpad;
   event.timeStampSeconds = GetCurrentEventTimeSec();
 
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   HandleInputEventOnViewOrPopup(event);
 }
 
 void EventSender::GestureFlingStart(float x,
                                     float y,
                                     float velocity_x,
                                     float velocity_y,
                                     gin::Arguments* args) {
   WebGestureEvent event;
@@ skipping 15 matching lines @@
   event.x = x;
   event.y = y;
   event.globalX = event.x;
   event.globalY = event.y;
 
   event.data.flingStart.velocityX = velocity_x;
   event.data.flingStart.velocityY = velocity_y;
   event.timeStampSeconds = GetCurrentEventTimeSec();
 
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   HandleInputEventOnViewOrPopup(event);
 }
 
 bool EventSender::IsFlinging() const {
   return view()->isFlinging();
 }
 
 void EventSender::GestureScrollFirstPoint(int x, int y) {
   current_gesture_location_ = WebPoint(x, y);
@@ skipping 180 matching lines @@
   InitMouseWheelEvent(args, scroll_type, &wheel_event, &send_gestures);
   if (HandleInputEventOnViewOrPopup(wheel_event) ==
           WebInputEventResult::NotHandled &&
       send_gestures) {
     SendGesturesForMouseWheelEvent(wheel_event);
   }
 }
 
 void EventSender::MouseMoveTo(gin::Arguments* args) {
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   double x;
   double y;
   blink::WebPointerProperties::PointerType pointerType =
       blink::WebPointerProperties::PointerType::Mouse;
   int pointerId = 0;
   if (!args->GetNext(&x) || !args->GetNext(&y)) {
     args->ThrowError();
     return;
   }
@@ skipping 34 matching lines @@
         pointerId,
         &event);
     HandleInputEventOnViewOrPopup(event);
     if (pointerType == blink::WebPointerProperties::PointerType::Mouse)
       DoDragAfterMouseMove(event);
   }
 }
 
 void EventSender::MouseLeave() {
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   WebMouseEvent event;
   InitMouseEvent(WebInputEvent::MouseLeave,
                  WebMouseEvent::ButtonNone,
                  0,
                  current_pointer_state_[kMousePointerId].last_pos_,
                  GetCurrentEventTimeSec(),
                  click_count_,
                  0,
                  blink::WebPointerProperties::PointerType::Mouse,
@@ skipping 27 matching lines @@
 
 void EventSender::DoLeapForward(int milliseconds) {
   time_offset_ms_ += milliseconds;
 }
 
 void EventSender::SendCurrentTouchEvent(WebInputEvent::Type type,
                                         bool movedBeyondSlopRegion) {
   DCHECK_GT(static_cast<unsigned>(WebTouchEvent::touchesLengthCap),
             touch_points_.size());
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   WebTouchEvent touch_event;
   touch_event.type = type;
   touch_event.modifiers = touch_modifiers_;
   touch_event.dispatchType = touch_cancelable_
                                  ? WebInputEvent::Blocking
                                  : WebInputEvent::EventNonBlocking;
   touch_event.timeStampSeconds = GetCurrentEventTimeSec();
   touch_event.movedBeyondSlopRegion = movedBeyondSlopRegion;
   touch_event.touchesLength = touch_points_.size();
@@ skipping 254 matching lines @@
       break;
     default:
       NOTREACHED();
   }
 
   event.globalX = event.x;
   event.globalY = event.y;
   event.timeStampSeconds = GetCurrentEventTimeSec();
 
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   WebInputEventResult result = HandleInputEventOnViewOrPopup(event);
 
   // Long press might start a drag drop session. Complete it if so.
   if (type == WebInputEvent::GestureLongPress && !current_drag_data_.isNull()) {
     WebMouseEvent mouse_event;
     InitMouseEvent(WebInputEvent::MouseDown,
                    current_pointer_state_[kMousePointerId].pressed_button_,
                    current_pointer_state_[kMousePointerId].current_buttons_,
                    WebPoint(x, y), GetCurrentEventTimeSec(),
@@ skipping 24 matching lines @@
 }
 
 void EventSender::InitMouseWheelEvent(gin::Arguments* args,
                                       MouseScrollType scroll_type,
                                       WebMouseWheelEvent* event,
                                       bool* send_gestures) {
   // Force a layout here just to make sure every position has been
   // determined before we send events (as well as all the other methods
   // that send an event do).
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   double horizontal;
   if (!args->GetNext(&horizontal)) {
     args->ThrowError();
     return;
   }
   double vertical;
   if (!args->GetNext(&vertical)) {
     args->ThrowError();
     return;
@@ skipping 203 matching lines @@
     }
   }
 
   replaying_saved_events_ = false;
 }
 
 WebInputEventResult EventSender::HandleInputEventOnViewOrPopup(
     const WebInputEvent& event) {
   last_event_timestamp_ = event.timeStampSeconds;
 
-  if (WebPagePopup* popup = view()->pagePopup()) {
+  if (WebPagePopup* popup = widget()->pagePopup()) {
     if (!WebInputEvent::isKeyboardEventType(event.type))
       return popup->handleInputEvent(event);
   }
-  return view()->handleInputEvent(event);
+  return widget()->handleInputEvent(event);

[Łukasz Anforowicz, 2016/06/02 21:05:19]

Even after this change http/tests/security/referrer-policy-redirect-link.html
keeps timing out.  Need further investigation...

 }
 
 void EventSender::SendGesturesForMouseWheelEvent(
     const WebMouseWheelEvent wheel_event) {
   WebGestureEvent begin_event;
   InitGestureEventFromMouseWheel(WebInputEvent::GestureScrollBegin,
                                  GetCurrentEventTimeSec(), wheel_event,
                                  &begin_event);
   begin_event.data.scrollBegin.deltaXHint = wheel_event.deltaX;
   begin_event.data.scrollBegin.deltaYHint = wheel_event.deltaY;
   if (wheel_event.scrollByPage) {
     begin_event.data.scrollBegin.deltaHintUnits = blink::WebGestureEvent::Page;
     if (begin_event.data.scrollBegin.deltaXHint) {
       begin_event.data.scrollBegin.deltaXHint =
           begin_event.data.scrollBegin.deltaXHint > 0 ? 1 : -1;
     }
     if (begin_event.data.scrollBegin.deltaYHint) {
       begin_event.data.scrollBegin.deltaYHint =
           begin_event.data.scrollBegin.deltaYHint > 0 ? 1 : -1;
     }
   } else {
     begin_event.data.scrollBegin.deltaHintUnits =
         wheel_event.hasPreciseScrollingDeltas
             ? blink::WebGestureEvent::PrecisePixels
             : blink::WebGestureEvent::Pixels;
   }
 
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
 
   HandleInputEventOnViewOrPopup(begin_event);
 
   WebGestureEvent update_event;
   InitGestureEventFromMouseWheel(WebInputEvent::GestureScrollUpdate,
                                  GetCurrentEventTimeSec(), wheel_event,
                                  &update_event);
   update_event.data.scrollUpdate.deltaX =
       begin_event.data.scrollBegin.deltaXHint;
   update_event.data.scrollUpdate.deltaY =
       begin_event.data.scrollBegin.deltaYHint;
   update_event.data.scrollUpdate.deltaUnits =
       begin_event.data.scrollBegin.deltaHintUnits;
 
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
   HandleInputEventOnViewOrPopup(update_event);
 
   WebGestureEvent end_event;
   InitGestureEventFromMouseWheel(WebInputEvent::GestureScrollEnd,
                                  GetCurrentEventTimeSec(), wheel_event,
                                  &end_event);
   end_event.data.scrollEnd.deltaUnits =
       begin_event.data.scrollBegin.deltaHintUnits;
 
   if (force_layout_on_events_)
-    view()->updateAllLifecyclePhases();
+    widget()->updateAllLifecyclePhases();
   HandleInputEventOnViewOrPopup(end_event);
 }
 
 TestInterfaces* EventSender::interfaces() {
-  return web_test_proxy_base_->test_interfaces();
+  return web_frame_test_proxy_base_->web_test_proxy_base()->test_interfaces();
 }
 
 WebTestDelegate* EventSender::delegate() {
-  return web_test_proxy_base_->delegate();
+  return web_frame_test_proxy_base_->web_test_proxy_base()->delegate();
 }
 
 const blink::WebView* EventSender::view() const {
-  return web_test_proxy_base_->web_view();
+  return web_frame_test_proxy_base_->web_frame()->view();
 }
 
 blink::WebView* EventSender::view() {
-  return web_test_proxy_base_->web_view();
+  return web_frame_test_proxy_base_->web_frame()->view();
+}
+
+blink::WebWidget* EventSender::widget() {
+  if (web_frame_test_proxy_base_->web_frame())
+    return web_frame_test_proxy_base_->web_frame()->localRoot()->frameWidget();
+  return nullptr;
 }
 
 }  // namespace test_runner