Mus: Remove CompositorFrameSinkType

services/ui/ws/frame_generator.cc

Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index c4c309b00a0f71a193c3c7b3c4e6e0648dba66a0..bb56571e1bd0b0126c3eb3ff7096fbee364a47af 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -159,13 +159,11 @@ 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;
@@ -198,8 +196,7 @@ cc::SurfaceId FrameGenerator::FindParentSurfaceId(ServerWindow* window) {
   // 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,
@@ -293,17 +290,10 @@ void FrameGenerator::OnWindowDestroying(ServerWindow* window) {
   // 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