Mus: Remove dependency on ServerWindowCompositorFrameSink from FrameGenerator

services/ui/ws/frame_generator.cc

 // Copyright 2016 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 "services/ui/ws/frame_generator.h"
 
 #include "base/containers/adapters.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
@@ skipping 68 matching lines @@
 }
 
 void FrameGenerator::Draw() {
   if (!delegate_->GetRootWindow()->visible())
     return;
 
   const gfx::Rect output_rect(delegate_->GetViewportMetrics().pixel_size);
   dirty_rect_.Intersect(output_rect);
   // TODO(fsamuel): We should add a trace for generating a top level frame.
   cc::CompositorFrame frame(GenerateCompositorFrame(output_rect));
-  if (frame.metadata.may_contain_video != may_contain_video_) {
-    may_contain_video_ = frame.metadata.may_contain_video;
-    // TODO(sad): Schedule notifying observers.
-    if (may_contain_video_) {
-      // TODO(sad): Start a timer to reset the bit if no new frame with video
-      // is submitted 'soon'.
-    }
-  }
   if (compositor_frame_sink_) {
     frame_pending_ = true;
     compositor_frame_sink_->SubmitCompositorFrame(
         std::move(frame),
         base::Bind(&FrameGenerator::DidDraw, weak_factory_.GetWeakPtr()));
   }
   dirty_rect_ = gfx::Rect();
 }
 
 void FrameGenerator::DidDraw() {
   frame_pending_ = false;
   if (!dirty_rect_.IsEmpty())
     WantToDraw();
 }
 
 cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
     const gfx::Rect& output_rect) {
   const cc::RenderPassId render_pass_id(1, 1);
   std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
   render_pass->SetNew(render_pass_id, output_rect, dirty_rect_,
                       gfx::Transform());
 
-  bool may_contain_video = false;
   DrawWindowTree(render_pass.get(), delegate_->GetRootWindow(), gfx::Vector2d(),
-                 1.0f, &may_contain_video);
+                 1.0f);
 
   std::unique_ptr<cc::DelegatedFrameData> frame_data(
       new cc::DelegatedFrameData);
   frame_data->render_pass_list.push_back(std::move(render_pass));
   if (delegate_->IsInHighContrastMode()) {
     std::unique_ptr<cc::RenderPass> invert_pass = cc::RenderPass::Create();
     invert_pass->SetNew(cc::RenderPassId(2, 0), output_rect, dirty_rect_,
                         gfx::Transform());
     cc::SharedQuadState* shared_state =
         invert_pass->CreateAndAppendSharedQuadState();
     shared_state->SetAll(gfx::Transform(), output_rect.size(), output_rect,
                          output_rect, false, 1.f, SkXfermode::kSrcOver_Mode, 0);
     auto* quad = invert_pass->CreateAndAppendDrawQuad<cc::RenderPassDrawQuad>();
     cc::FilterOperations filters;
     filters.Append(cc::FilterOperation::CreateInvertFilter(1.f));
     quad->SetNew(shared_state, output_rect, output_rect, render_pass_id,
                  0 /* mask_resource_id */, gfx::Vector2dF() /* mask_uv_scale */,
                  gfx::Size() /* mask_texture_size */, filters,
                  gfx::Vector2dF() /* filters_scale */,
                  gfx::PointF() /* filters_origin */,
                  cc::FilterOperations() /* background_filters */);
     frame_data->render_pass_list.push_back(std::move(invert_pass));
   }
 
   cc::CompositorFrame frame;
   frame.delegated_frame_data = std::move(frame_data);
-  frame.metadata.may_contain_video = may_contain_video;
   return frame;
 }
 
 void FrameGenerator::DrawWindowTree(
     cc::RenderPass* pass,
     ServerWindow* window,
     const gfx::Vector2d& parent_to_root_origin_offset,
-    float opacity,
-    bool* may_contain_video) {
+    float opacity) {
   if (!window->visible())
     return;
 
-  ServerWindowCompositorFrameSink* default_compositor_frame_sink =
-      window->compositor_frame_sink_manager()
-          ? window->compositor_frame_sink_manager()
-                ->GetDefaultCompositorFrameSink()
-          : nullptr;
-
   const gfx::Rect absolute_bounds =
       window->bounds() + parent_to_root_origin_offset;
   const ServerWindow::Windows& children = window->children();
   const float combined_opacity = opacity * window->opacity();
   for (ServerWindow* child : base::Reversed(children)) {
     DrawWindowTree(pass, child, absolute_bounds.OffsetFromOrigin(),
-                   combined_opacity, may_contain_video);
+                   combined_opacity);
   }
 
   if (!window->compositor_frame_sink_manager() ||
       !window->compositor_frame_sink_manager()->ShouldDraw())
     return;
 
-  ServerWindowCompositorFrameSink* underlay_compositor_frame_sink =
-      window->compositor_frame_sink_manager()->GetUnderlayCompositorFrameSink();
-  if (!default_compositor_frame_sink && !underlay_compositor_frame_sink)
+  cc::SurfaceId underlay_surface_id =
+      window->compositor_frame_sink_manager()->GetLastSurfaceId(
+          mojom::CompositorFrameSinkType::UNDERLAY);
+  cc::SurfaceId default_surface_id =
+      window->compositor_frame_sink_manager()->GetLastSurfaceId(
+          mojom::CompositorFrameSinkType::DEFAULT);
+
+  if (underlay_surface_id.is_null() && default_surface_id.is_null())
     return;
 
-  if (default_compositor_frame_sink) {
+  if (!default_surface_id.is_null()) {
     gfx::Transform quad_to_target_transform;
     quad_to_target_transform.Translate(absolute_bounds.x(),
                                        absolute_bounds.y());
 
     cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
 
     const gfx::Rect bounds_at_origin(window->bounds().size());
     // 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 */,
                 bounds_at_origin /* visible_layer_bounds */,
                 bounds_at_origin /* clip_rect */, false /* is_clipped */,
                 combined_opacity, SkXfermode::kSrcOver_Mode,
                 0 /* sorting-context_id */);
     auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
-    AddOrUpdateSurfaceReference(default_compositor_frame_sink);
+    AddOrUpdateSurfaceReference(mojom::CompositorFrameSinkType::DEFAULT,
+                                window);
     quad->SetAll(sqs, bounds_at_origin /* rect */,
                  gfx::Rect() /* opaque_rect */,
                  bounds_at_origin /* visible_rect */, true /* needs_blending*/,
-                 default_compositor_frame_sink->GetSurfaceId());
-    if (default_compositor_frame_sink->may_contain_video())
-      *may_contain_video = true;
+                 default_surface_id);
   }
-  if (underlay_compositor_frame_sink) {
+  if (!underlay_surface_id.is_null()) {
     const gfx::Rect underlay_absolute_bounds =
         absolute_bounds - window->underlay_offset();
     gfx::Transform quad_to_target_transform;
     quad_to_target_transform.Translate(underlay_absolute_bounds.x(),
                                        underlay_absolute_bounds.y());
     cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
     const gfx::Rect bounds_at_origin(
-        underlay_compositor_frame_sink->last_submitted_frame_size());
+        window->compositor_frame_sink_manager()->GetLastFrameSize(
+            mojom::CompositorFrameSinkType::UNDERLAY));
     sqs->SetAll(quad_to_target_transform,
                 bounds_at_origin.size() /* layer_bounds */,
                 bounds_at_origin /* visible_layer_bounds */,
                 bounds_at_origin /* clip_rect */, false /* is_clipped */,
                 combined_opacity, SkXfermode::kSrcOver_Mode,
                 0 /* sorting-context_id */);
 
     auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
-    AddOrUpdateSurfaceReference(underlay_compositor_frame_sink);
+    AddOrUpdateSurfaceReference(mojom::CompositorFrameSinkType::UNDERLAY,
+                                window);
     quad->SetAll(sqs, bounds_at_origin /* rect */,
                  gfx::Rect() /* opaque_rect */,
                  bounds_at_origin /* visible_rect */, true /* needs_blending*/,
-                 underlay_compositor_frame_sink->GetSurfaceId());
-    DCHECK(!underlay_compositor_frame_sink->may_contain_video());
+                 underlay_surface_id);
   }
 }
 
 void FrameGenerator::AddOrUpdateSurfaceReference(
-    ServerWindowCompositorFrameSink* window_surface) {
-  if (!window_surface->has_frame())
+    mojom::CompositorFrameSinkType type,
+    ServerWindow* window) {
+  cc::SurfaceId surface_id =
+      window->compositor_frame_sink_manager()->GetLastSurfaceId(type);
+  if (surface_id.is_null())
     return;
-  cc::SurfaceId surface_id = window_surface->GetSurfaceId();
+  // TODO(fsamuel): Use mojo interface to give root window a surface reference.
   cc::SurfaceManager* surface_manager = display_compositor_->manager();
   auto it = dependencies_.find(surface_id.frame_sink_id());
   if (it == dependencies_.end()) {
     cc::Surface* surface = surface_manager->GetSurfaceForId(surface_id);
     if (!surface) {
       LOG(ERROR) << "Attempting to add dependency to nonexistent surface "
                  << surface_id.ToString();
       return;
     }
     SurfaceDependency dependency = {
         surface_id.local_frame_id(),
         surface_sequence_generator_.CreateSurfaceSequence()};
     surface->AddDestructionDependency(dependency.sequence);
     dependencies_[surface_id.frame_sink_id()] = dependency;
     // Observe |window_surface|'s window so that we can release references when
     // the window is destroyed.
-    if (!window_surface->window()->HasObserver(this))
-      window_surface->window()->AddObserver(this);
+    if (!window->HasObserver(this))
+      window->AddObserver(this);

[sadrul, 2016/10/27 05:06:30]

Need to merge this with the crash fix.

[Fady Samuel, 2016/10/27 05:46:37]

Will do once it lands.

     return;
   }
 
   // We are already holding a reference to this surface so there's no work to do
   // here.
   if (surface_id.local_frame_id() == it->second.local_frame_id)
     return;
 
   // If we have have an existing reference to a surface from the given
   // FrameSink, then we should release the reference, and then add this new
   // reference. This results in a delete and lookup in the map but simplifies
   // the code.
   ReleaseFrameSinkReference(surface_id.frame_sink_id());
 
   // This recursion will always terminate. This line is being called because
   // there was a stale surface reference. The stale reference has been released
   // in the previous line and cleared from the dependencies_ map. Thus, in the
   // recursive call, we'll enter the second if blcok because the FrameSinkId
   // is no longer referenced in the map.
-  AddOrUpdateSurfaceReference(window_surface);
+  AddOrUpdateSurfaceReference(type, window);
 }
 
 void FrameGenerator::ReleaseFrameSinkReference(
     const cc::FrameSinkId& frame_sink_id) {
   auto it = dependencies_.find(frame_sink_id);
   if (it == dependencies_.end())
     return;
   std::vector<uint32_t> sequences;
   sequences.push_back(it->second.sequence.sequence);
   cc::SurfaceManager* surface_manager = display_compositor_->manager();
   surface_manager->DidSatisfySequences(frame_sink_id_, &sequences);
   dependencies_.erase(it);
 }
 
 void FrameGenerator::ReleaseAllSurfaceReferences() {
   cc::SurfaceManager* surface_manager = display_compositor_->manager();
   std::vector<uint32_t> sequences;
   for (auto& dependency : dependencies_)
     sequences.push_back(dependency.second.sequence.sequence);
   surface_manager->DidSatisfySequences(frame_sink_id_, &sequences);
   dependencies_.clear();
 }
 
 void FrameGenerator::OnWindowDestroying(ServerWindow* window) {
   window->RemoveObserver(this);
-  ServerWindowCompositorFrameSinkManager* surface_manager =
+  ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager =
       window->compositor_frame_sink_manager();
-  // If FrameGenerator was observing |window|, then that means it had a surface
-  // at some point in time and should have a
+  // If FrameGenerator was observing |window|, then that means it had a
+  // CompositorFrame at some point in time and should have a
   // ServerWindowCompositorFrameSinkManager.
-  DCHECK(surface_manager);
-  ServerWindowCompositorFrameSink* default_compositor_frame_sink =
-      surface_manager->GetDefaultCompositorFrameSink();
-  if (default_compositor_frame_sink)
-    ReleaseFrameSinkReference(default_compositor_frame_sink->frame_sink_id());
-  ServerWindowCompositorFrameSink* underlay_compositor_frame_sink =
-      surface_manager->GetUnderlayCompositorFrameSink();
-  if (underlay_compositor_frame_sink)
-    ReleaseFrameSinkReference(underlay_compositor_frame_sink->frame_sink_id());
+  DCHECK(compositor_frame_sink_manager);
+
+  cc::SurfaceId default_surface_id =
+      window->compositor_frame_sink_manager()->GetLastSurfaceId(
+          mojom::CompositorFrameSinkType::DEFAULT);
+  if (!default_surface_id.is_null())
+    ReleaseFrameSinkReference(default_surface_id.frame_sink_id());
+
+  cc::SurfaceId underlay_surface_id =
+      window->compositor_frame_sink_manager()->GetLastSurfaceId(
+          mojom::CompositorFrameSinkType::UNDERLAY);
+  if (!underlay_surface_id.is_null())
+    ReleaseFrameSinkReference(underlay_surface_id.frame_sink_id());
 }
 
 }  // namespace ws
 
 }  // namespace ui