Mandoline: Support transforms and clipping of OOPIFs and events

components/mus/display_manager.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/mus/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
@@ skipping 38 matching lines @@
 
 void DrawViewTree(cc::RenderPass* pass,
                   const ServerView* view,
                   const gfx::Vector2d& parent_to_root_origin_offset,
                   float opacity) {
   if (!view->visible())
     return;
 
   const gfx::Rect absolute_bounds =
       view->bounds() + parent_to_root_origin_offset;
-  std::vector<const ServerView*> children(view->GetChildren());
-  const float combined_opacity = opacity * view->opacity();
-  for (std::vector<const ServerView*>::reverse_iterator it = children.rbegin();
-       it != children.rend(); ++it) {
-    DrawViewTree(pass, *it, absolute_bounds.OffsetFromOrigin(),
-                 combined_opacity);
+
+  if (!view->parent() || view->surface_id().is_null()) {
+    std::vector<const ServerView*> children(view->GetChildren());
+    const float combined_opacity = opacity * view->opacity();
+    for (auto it = children.rbegin(); it != children.rend(); ++it) {
+      DrawViewTree(pass, *it, absolute_bounds.OffsetFromOrigin(),

[rjkroege, 2015/09/16 21:31:37]

can you remind me why there are multiple view trees?

[Fady Samuel, 2015/09/17 18:31:42]

We don't really. This is recursively visiting the view tree. I added a comment
above.

+                  combined_opacity);
+    }
   }
 
   gfx::Transform quad_to_target_transform;
   quad_to_target_transform.Translate(absolute_bounds.x(), absolute_bounds.y());
   const gfx::Rect bounds_at_origin(view->bounds().size());
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
   // TODO(fsamuel): These clipping and visible rects are incorrect. They need
   // to be populated from CompositorFrame structs.
   sqs->SetAll(
       quad_to_target_transform, bounds_at_origin.size() /* layer_bounds */,
@@ skipping 115 matching lines @@
   if (ime)
     ime->UpdateTextInputState(state);
 }
 
 void DefaultDisplayManager::SetImeVisibility(bool visible) {
   ui::PlatformImeController* ime = platform_window_->GetPlatformImeController();
   if (ime)
     ime->SetImeVisibility(visible);
 }
 
 void DefaultDisplayManager::Draw() {

[rjkroege, 2015/09/16 21:31:37]

this is the top-level draw to the display function right?

btw: you could put more comments in your code... every time that I ask a
question like this, it means that someone else who is new to the code might also
want a helpful comment. 

[Fady Samuel, 2015/09/17 18:31:42]

To be fair, I didn't write this method :P I did add a comment to the header.

   if (!delegate_->GetRootView()->visible())
     return;
 
-  scoped_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
-  render_pass->damage_rect = dirty_rect_;
-  render_pass->output_rect = gfx::Rect(metrics_.size_in_pixels.To<gfx::Size>());
-
-  DrawViewTree(render_pass.get(), delegate_->GetRootView(), gfx::Vector2d(),
-               1.0f);
-
-  scoped_ptr<cc::DelegatedFrameData> frame_data(new cc::DelegatedFrameData);
-  frame_data->device_scale_factor = 1.f;
-  frame_data->render_pass_list.push_back(render_pass.Pass());
-
-  scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
-  frame->delegated_frame_data = frame_data.Pass();
+  scoped_ptr<cc::CompositorFrame> frame(GenerateCompositorFrame());

[rjkroege, 2015/09/16 21:31:37]

you assemble the top-level OutputSurface CompositorFrame here? i.e.: on the
critical path for drawing.

Add TODO to bracket the assembly process with trace points.

[Fady Samuel, 2015/09/17 18:31:42]

Done.

   frame_pending_ = true;
   if (top_level_display_client_) {
     top_level_display_client_->SubmitCompositorFrame(
         frame.Pass(), base::Bind(&DefaultDisplayManager::DidDraw,
                                  weak_factory_.GetWeakPtr()));
   }
   dirty_rect_ = gfx::Rect();
 }
 
 void DefaultDisplayManager::DidDraw() {
@@ skipping 21 matching lines @@
   mojo::ViewportMetrics old_metrics;
   old_metrics.size_in_pixels = metrics_.size_in_pixels.Clone();
   old_metrics.device_pixel_ratio = metrics_.device_pixel_ratio;
 
   metrics_.size_in_pixels = mojo::Size::From(size);
   metrics_.device_pixel_ratio = device_pixel_ratio;
 
   delegate_->OnViewportMetricsChanged(old_metrics, metrics_);
 }
 
+scoped_ptr<cc::CompositorFrame>
+DefaultDisplayManager::GenerateCompositorFrame() {
+  scoped_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
+  render_pass->damage_rect = dirty_rect_;
+  render_pass->output_rect = gfx::Rect(metrics_.size_in_pixels.To<gfx::Size>());
+
+  DrawViewTree(render_pass.get(),
+               delegate_->GetRootView(),
+               gfx::Vector2d(), 1.0f);
+
+  scoped_ptr<cc::DelegatedFrameData> frame_data(new cc::DelegatedFrameData);
+  frame_data->device_scale_factor = 1.f;
+  frame_data->render_pass_list.push_back(render_pass.Pass());
+
+  scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
+  frame->delegated_frame_data = frame_data.Pass();
+  return frame.Pass();
+}
+
+const cc::CompositorFrame*
+DefaultDisplayManager::GetLastCompositorFrame() const {
+  if (!top_level_display_client_)
+    return nullptr;
+
+  return top_level_display_client_->GetLastCompositorFrame();
+}
+
 void DefaultDisplayManager::OnBoundsChanged(const gfx::Rect& new_bounds) {
   UpdateMetrics(new_bounds.size(), metrics_.device_pixel_ratio);
 }
 
 void DefaultDisplayManager::OnDamageRect(const gfx::Rect& damaged_region) {
   dirty_rect_.Union(damaged_region);
   WantToDraw();
 }
 
 void DefaultDisplayManager::DispatchEvent(ui::Event* event) {
   mojo::EventPtr mojo_event(mojo::Event::From(*event));
   if (event->IsMouseWheelEvent()) {
     // Mojo's event type has a different meaning for wheel events. Convert
     // between the two.
     ui::MouseWheelEvent* wheel_event = static_cast<ui::MouseWheelEvent*>(event);
     DCHECK(mojo_event->pointer_data);
     mojo_event->pointer_data->horizontal_wheel =
         ConvertUIWheelValueToMojoValue(wheel_event->x_offset());
     mojo_event->pointer_data->horizontal_wheel =
         ConvertUIWheelValueToMojoValue(wheel_event->y_offset());
   }
-  delegate_->OnEvent(mojo_event.Pass());
+  ViewId id;
+  if (event->IsLocatedEvent() && !!top_level_display_client_) {
+    ui::LocatedEvent* located_event = static_cast<ui::LocatedEvent*>(event);
+    gfx::Point transformed_point;
+    cc::SurfaceId target_surface =
+        surfaces_state_->hit_tester()->GetTargetSurfaceAtPoint(
+            top_level_display_client_->surface_id(),
+            located_event->location(),
+            &transformed_point);
+    id = ViewIdFromTransportId(
+        cc::SurfaceIdAllocator::NamespaceForId(target_surface));
+    mojo_event->pointer_data->x = transformed_point.x();

[rjkroege, 2015/09/16 21:31:37]

you don't translate the screen coords? they are in screen coordinates? it
strikes me that this possibly leaks information into the OOPIF. probably fine.

[Fady Samuel, 2015/09/17 18:31:42]

I'm not translating the screen coordinates. I'm actually not sure how
html_viewer uses screen coordinates...

+    mojo_event->pointer_data->y = transformed_point.y();
+  }
+  delegate_->OnEvent(id, mojo_event.Pass());
 
   switch (event->type()) {
     case ui::ET_MOUSE_PRESSED:
     case ui::ET_TOUCH_PRESSED:
       platform_window_->SetCapture();
       break;
     case ui::ET_MOUSE_RELEASED:
     case ui::ET_TOUCH_RELEASED:
       platform_window_->ReleaseCapture();
       break;
@@ skipping 22 matching lines @@
     DCHECK_EQ(key_press_event->GetCharacter(), char_event.GetCharacter());
     DCHECK_EQ(key_press_event->key_code(), char_event.key_code());
     DCHECK_EQ(key_press_event->flags(), char_event.flags());
 
     char_event.SetExtendedKeyEventData(
         make_scoped_ptr(new mojo::MojoExtendedKeyEventData(
             key_press_event->GetLocatedWindowsKeyboardCode(),
             key_press_event->GetText(), key_press_event->GetUnmodifiedText())));
     char_event.set_platform_keycode(key_press_event->platform_keycode());
 
-    delegate_->OnEvent(mojo::Event::From(char_event));
+    delegate_->OnEvent(id, mojo::Event::From(char_event));
   }
 #endif
 }
 
 void DefaultDisplayManager::OnCloseRequest() {
   platform_window_->Close();
 }
 
 void DefaultDisplayManager::OnClosed() {
   delegate_->OnDisplayClosed();
@@ skipping 10 matching lines @@
   if (widget != gfx::kNullAcceleratedWidget) {
     top_level_display_client_.reset(new surfaces::TopLevelDisplayClient(
         widget, gpu_state_, surfaces_state_));
   }
   UpdateMetrics(metrics_.size_in_pixels.To<gfx::Size>(), device_pixel_ratio);
 }
 
 void DefaultDisplayManager::OnActivationChanged(bool active) {}
 
 }  // namespace view_manager