Mus: Remove CompositorFrameSinkType

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 <utility>
 
 #include "base/containers/adapters.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 141 matching lines @@
   }
   frame.metadata.device_scale_factor = device_scale_factor_;
 
   return frame;
 }
 
 void FrameGenerator::DrawWindow(cc::RenderPass* pass, ServerWindow* window) {
   if (!window || !window->visible())
     return;
 
-  if (!window->compositor_frame_sink_manager() ||
-      !window->compositor_frame_sink_manager()->ShouldDraw())
+  if (!window->compositor_frame_sink_manager())
     return;
 
   cc::SurfaceId default_surface_id =
-      window->compositor_frame_sink_manager()->GetLatestSurfaceId(
-          mojom::CompositorFrameSinkType::DEFAULT);
+      window->compositor_frame_sink_manager()->GetLatestSurfaceId();
 
   if (!default_surface_id.is_valid())
     return;
 
   gfx::Transform quad_to_target_transform;
   quad_to_target_transform.Translate(window->bounds().x(),
                                      window->bounds().y());
 
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
 
@@ skipping 12 matching lines @@
                default_surface_id);
 }
 
 cc::SurfaceId FrameGenerator::FindParentSurfaceId(ServerWindow* window) {
   if (window == root_window_)
     return root_window_->delegate()->GetRootSurfaceId();
 
   // The root window holds the parent SurfaceId. This SurfaceId will have an
   // invalid LocalFrameId before FrameGenerator has submitted a CompositorFrame.
   // After the first frame is submitted it will always be a valid SurfaceId.
-  return root_window_->compositor_frame_sink_manager()->GetLatestSurfaceId(
-      mojom::CompositorFrameSinkType::DEFAULT);
+  return root_window_->compositor_frame_sink_manager()->GetLatestSurfaceId();
 }
 
 void FrameGenerator::AddSurfaceReference(const cc::SurfaceId& parent_id,
                                          const cc::SurfaceId& child_id) {
   DCHECK_NE(parent_id, child_id);
 
   // Add new reference from parent to surface and record reference.
   cc::SurfaceReference ref(parent_id, child_id);
   active_references_[child_id.frame_sink_id()] = ref;
   references_to_add_.push_back(ref);
@@ skipping 73 matching lines @@
 
 void FrameGenerator::OnWindowDestroying(ServerWindow* window) {
   Remove(window);
   ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager =
       window->compositor_frame_sink_manager();
   // If FrameGenerator was observing |window|, then that means it had a
   // CompositorFrame at some point in time and should have a
   // ServerWindowCompositorFrameSinkManager.
   DCHECK(compositor_frame_sink_manager);
 
-  cc::SurfaceId default_surface_id =
-      window->compositor_frame_sink_manager()->GetLatestSurfaceId(
-          mojom::CompositorFrameSinkType::DEFAULT);
-  if (default_surface_id.is_valid())
-    RemoveFrameSinkReference(default_surface_id.frame_sink_id());
-
-  cc::SurfaceId underlay_surface_id =
-      window->compositor_frame_sink_manager()->GetLatestSurfaceId(
-          mojom::CompositorFrameSinkType::UNDERLAY);
-  if (underlay_surface_id.is_valid())
-    RemoveFrameSinkReference(underlay_surface_id.frame_sink_id());
+  cc::SurfaceId surface_id =
+      window->compositor_frame_sink_manager()->GetLatestSurfaceId();
+  if (surface_id.is_valid())
+    RemoveFrameSinkReference(surface_id.frame_sink_id());
 }
 
 }  // namespace ws
 
 }  // namespace ui