content/browser/renderer_host/input/synthetic_gesture_target_aura.cc - Issue 184903003: Window ownership -> WindowTreeHost

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

Issue 184903003: Window ownership -> WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/media/capture/desktop_capture_device_aura.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

index 123999ed784449f9439a09f0fa4d89b87a194e21..5dad88d65634aa571154d2681aa337819fd85db6 100644

--- a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

+++ b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

@@ -31,11 +31,12 @@ void SyntheticGestureTargetAura::DispatchWebTouchEventToPlatform(

DCHECK(conversion_success);

aura::Window* window = GetWindow();

- aura::WindowEventDispatcher* dispatcher = window->GetDispatcher();

+ aura::WindowTreeHost* host = window->GetHost();

for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(),

end = events.end(); iter != end; ++iter) {

- (*iter)->ConvertLocationToTarget(window, dispatcher->window());

- ui::EventDispatchDetails details = dispatcher->OnEventFromSource(*iter);

+ (*iter)->ConvertLocationToTarget(window, host->window());

+ ui::EventDispatchDetails details =

+ host->dispatcher()->OnEventFromSource(*iter);

if (details.dispatcher_destroyed)

break;

}

@@ -53,7 +54,7 @@ void SyntheticGestureTargetAura::DispatchWebMouseWheelEventToPlatform(

aura::Window* window = GetWindow();

wheel_event.ConvertLocationToTarget(window, window->GetRootWindow());

ui::EventDispatchDetails details =

- window->GetDispatcher()->OnEventFromSource(&wheel_event);

+ window->GetHost()->dispatcher()->OnEventFromSource(&wheel_event);

if (details.dispatcher_destroyed)

return;

}

@@ -120,7 +121,7 @@ void SyntheticGestureTargetAura::DispatchWebMouseEventToPlatform(

aura::Window* window = GetWindow();

mouse_event.ConvertLocationToTarget(window, window->GetRootWindow());

ui::EventDispatchDetails details =

- window->GetDispatcher()->OnEventFromSource(&mouse_event);

+ window->GetHost()->dispatcher()->OnEventFromSource(&mouse_event);

if (details.dispatcher_destroyed)

return;

}