| Index: components/mus/view_tree_host_impl.cc
|
| diff --git a/components/mus/view_tree_host_impl.cc b/components/mus/view_tree_host_impl.cc
|
| index 7f04d19d4054242bb6f05d5396e1d8038dc86424..32fcfe2cebf0b099dbc4f50279712425abd62f6a 100644
|
| --- a/components/mus/view_tree_host_impl.cc
|
| +++ b/components/mus/view_tree_host_impl.cc
|
| @@ -113,7 +113,6 @@ void ViewTreeHostImpl::DispatchInputEventToView(const ServerView* target,
|
| connection_manager_->GetConnectionWithRoot(target->id());
|
| if (!connection)
|
| connection = connection_manager_->GetConnection(target->id().connection_id);
|
| - DCHECK_EQ(this, connection->GetHost());
|
| connection->client()->OnViewInputEvent(ViewIdToTransportId(target->id()),
|
| event.Pass(),
|
| base::Bind(&base::DoNothing));
|
| @@ -150,7 +149,15 @@ ServerView* ViewTreeHostImpl::GetRootView() {
|
| return root_.get();
|
| }
|
|
|
| -void ViewTreeHostImpl::OnEvent(mojo::EventPtr event) {
|
| +void ViewTreeHostImpl::OnEvent(ViewId id, mojo::EventPtr event) {
|
| + ServerView* view = connection_manager_->GetView(id);
|
| + // TODO(fsamuel): This should be a DCHECK but currently we use stale
|
| + // information to decide where to route input events. This should be fixed
|
| + // once we implement a UI scheduler.
|
| + if (view) {
|
| + DispatchInputEventToView(view, event.Pass());
|
| + return;
|
| + }
|
| event_dispatcher_.OnEvent(event.Pass());
|
| }
|
|
|
|
|