Mandoline: Support transforms and clipping of OOPIFs and events

components/mus/view_tree_host_impl.cc

 // Copyright 2015 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/mus/view_tree_host_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/connection_manager.h"
 #include "components/mus/display_manager.h"
 #include "components/mus/focus_controller.h"
@@ skipping 95 matching lines @@
   client()->OnAccelerator(accelerator_id, event.Pass());
 }
 
 void ViewTreeHostImpl::DispatchInputEventToView(const ServerView* target,
                                                 mojo::EventPtr event) {
   // If the view is an embed root, forward to the embedded view, not the owner.
   ViewTreeImpl* connection =
       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));
 }
 
 void ViewTreeHostImpl::SetSize(mojo::SizePtr size) {
   display_manager_->SetViewportSize(size.To<gfx::Size>());
 }
 
 void ViewTreeHostImpl::SetTitle(const mojo::String& title) {
@@ skipping 16 matching lines @@
   // can destroy the corresponding ViewTreeHostConnection, and |this|. So
   // setting it to nullptr afterwards in reset() ends up writing on free'd
   // memory. So transfer over to a local scoped_ptr<> before destroying it.
   scoped_ptr<DisplayManager> temp = display_manager_.Pass();
 }
 
 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);
+  if (view) {

[sky, 2015/09/17 22:36:05]

How about a TODO here, as this should really be a DCHECK.

[Fady Samuel, 2015/09/17 23:58:01]

Done.

+    DispatchInputEventToView(view, event.Pass());
+    return;
+  }
   event_dispatcher_.OnEvent(event.Pass());
 }
 
 void ViewTreeHostImpl::OnDisplayClosed() {
   if (delegate_)
     delegate_->OnDisplayClosed();
 }
 
 void ViewTreeHostImpl::OnViewportMetricsChanged(
     const mojo::ViewportMetrics& old_metrics,
@@ skipping 68 matching lines @@
       root_tree != embedded_connection_old &&
       root_tree != owning_connection_new &&
       root_tree != embedded_connection_new) {
     root_tree->ProcessFocusChanged(old_focused_view, new_focused_view);
   }
 
   UpdateTextInputState(new_focused_view, new_focused_view->text_input_state());
 }
 
 }  // namespace mus