aura: Remove event-dispatch methods from WindowTreeHostDelegate interface.

content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

 // Copyright 2013 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/renderer_host/input/synthetic_gesture_target_aura.h"
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 29 matching lines @@
     position_client->ConvertPointToScreen(window, &position);
     point->screenPosition.x = position.x();
     point->screenPosition.y = position.y();
   }
 
   ScopedVector<ui::TouchEvent> events;
   bool conversion_success = MakeUITouchEventsFromWebTouchEvents(
       touch_with_latency, &events, SCREEN_COORDINATES);
   DCHECK(conversion_success);
 
-  aura::WindowTreeHostDelegate* root_window_host_delegate =
-      GetWindowTreeHostDelegate();
+  aura::WindowEventDispatcher* dispatcher = GetWindowEventDispatcher();
   for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(),
       end = events.end(); iter != end; ++iter) {
-    root_window_host_delegate->OnHostTouchEvent(*iter);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(*iter);
+    if (details.dispatcher_destroyed)
+      break;
   }
 }
 
 void SyntheticGestureTargetAura::DispatchWebMouseWheelEventToPlatform(
       const blink::WebMouseWheelEvent& web_wheel,
       const ui::LatencyInfo&) {
   aura::Window* window = GetWindow();
   aura::client::ScreenPositionClient* position_client =
       GetScreenPositionClient();
   gfx::Point location(web_wheel.x, web_wheel.y);
   position_client->ConvertPointToScreen(window, &location);
 
   ui::MouseEvent mouse_event(
       ui::ET_MOUSEWHEEL, location, location, ui::EF_NONE, ui::EF_NONE);
   ui::MouseWheelEvent wheel_event(
       mouse_event, web_wheel.deltaX, web_wheel.deltaY);
 
-  GetWindowTreeHostDelegate()->OnHostMouseEvent(&wheel_event);
+  ui::EventDispatchDetails details =
+      GetWindowEventDispatcher()->OnEventFromSource(&wheel_event);
+  if (details.dispatcher_destroyed)
+    return;
 }
 
 namespace {
 
 ui::EventType
 WebMouseEventTypeToEventType(blink::WebInputEvent::Type web_type) {
   switch (web_type) {
     case blink::WebInputEvent::MouseDown:
       return ui::ET_MOUSE_PRESSED;
 
@@ skipping 46 matching lines @@
   aura::Window* window = GetWindow();
   aura::client::ScreenPositionClient* position_client =
       GetScreenPositionClient();
   gfx::Point location(web_mouse.x, web_mouse.y);
   position_client->ConvertPointToScreen(window, &location);
 
   ui::EventType event_type = WebMouseEventTypeToEventType(web_mouse.type);
   int flags = WebMouseEventButtonToFlags(web_mouse.button);
   ui::MouseEvent mouse_event(event_type, location, location, flags, flags);
 
-  GetWindowTreeHostDelegate()->OnHostMouseEvent(&mouse_event);
+  ui::EventDispatchDetails details =
+      GetWindowEventDispatcher()->OnEventFromSource(&mouse_event);
+  if (details.dispatcher_destroyed)
+    return;
 }
 
 SyntheticGestureParams::GestureSourceType
 SyntheticGestureTargetAura::GetDefaultSyntheticGestureSourceType() const {
   return SyntheticGestureParams::MOUSE_INPUT;
 }
 
 bool SyntheticGestureTargetAura::SupportsSyntheticGestureSourceType(
     SyntheticGestureParams::GestureSourceType gesture_source_type) const {
   return gesture_source_type == SyntheticGestureParams::TOUCH_INPUT ||
       gesture_source_type == SyntheticGestureParams::MOUSE_INPUT;
 }
 
 int SyntheticGestureTargetAura::GetTouchSlopInDips() const {
   // - 1 because Aura considers a pointer to be moving if it has moved at least
   // 'max_touch_move_in_pixels_for_click' pixels.
   return ui::GestureConfiguration::max_touch_move_in_pixels_for_click() - 1;
 }
 
 aura::Window* SyntheticGestureTargetAura::GetWindow() const {
   aura::Window* window = render_widget_host()->GetView()->GetNativeView();
   DCHECK(window);
   return window;
 }
 
-aura::WindowTreeHostDelegate*
-SyntheticGestureTargetAura::GetWindowTreeHostDelegate() const {
-  aura::Window* root_window = GetWindow()->GetRootWindow();
-  aura::WindowTreeHostDelegate* root_window_host_delegate =
-      root_window->GetDispatcher()->AsWindowTreeHostDelegate();
-  DCHECK(root_window_host_delegate);
-  return root_window_host_delegate;
+aura::WindowEventDispatcher*
+SyntheticGestureTargetAura::GetWindowEventDispatcher() const {
+  aura::WindowEventDispatcher* dispatcher = GetWindow()->GetDispatcher();
+  DCHECK(dispatcher);
+  return dispatcher;
 }
 
 aura::client::ScreenPositionClient*
 SyntheticGestureTargetAura::GetScreenPositionClient() const {
   aura::Window* root_window = GetWindow()->GetRootWindow();
   aura::client::ScreenPositionClient* position_client =
       aura::client::GetScreenPositionClient(root_window);
   DCHECK(position_client);
   return position_client;
 }
 
 }  // namespace content