Mus: Remove dependency on ServerWindowCompositorFrameSink from FrameGenerator

services/ui/ws/server_window_compositor_frame_sink.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 "services/ui/ws/server_window_compositor_frame_sink.h"
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/shared_quad_state.h"
@@ skipping 15 matching lines @@
       manager_(manager),
       surface_factory_(frame_sink_id_,
                        manager_->GetCompositorFrameSinkManager(),
                        this),
       client_(std::move(client)),
       binding_(this, std::move(request)) {
   cc::SurfaceManager* surface_manager =
       manager_->GetCompositorFrameSinkManager();
   surface_manager->RegisterFrameSinkId(frame_sink_id_);
   surface_manager->RegisterSurfaceFactoryClient(frame_sink_id_, this);
-  surface_sequence_generator_.set_frame_sink_id(frame_sink_id_);
 }
 
 ServerWindowCompositorFrameSink::~ServerWindowCompositorFrameSink() {
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
   surface_factory_.DestroyAll();
   cc::SurfaceManager* surface_manager =
       manager_->GetCompositorFrameSinkManager();
   surface_manager->UnregisterSurfaceFactoryClient(frame_sink_id_);
@@ skipping 10 matching lines @@
   gfx::Size frame_size =
       frame.delegated_frame_data->render_pass_list[0]->output_rect.size();
   // If the size of the CompostiorFrame has changed then destroy the existing
   // Surface and create a new one of the appropriate size.
   if (local_frame_id_.is_null() || frame_size != last_submitted_frame_size_) {
     if (!local_frame_id_.is_null())
       surface_factory_.Destroy(local_frame_id_);
     local_frame_id_ = surface_id_allocator_.GenerateId();
     surface_factory_.Create(local_frame_id_);
   }
-  may_contain_video_ = frame.metadata.may_contain_video;
   surface_factory_.SubmitCompositorFrame(
       local_frame_id_, std::move(frame),
       base::Bind(&ServerWindowCompositorFrameSink::DidReceiveCompositorFrameAck,
                  base::Unretained(this)));
   last_submitted_frame_size_ = frame_size;
-  window()->delegate()->OnScheduleWindowPaint(window());
-}
-
-cc::SurfaceId ServerWindowCompositorFrameSink::GetSurfaceId() const {
-  if (local_frame_id_.is_null())
-    return cc::SurfaceId();
-  return cc::SurfaceId(frame_sink_id_, local_frame_id_);
-}
-
-cc::SurfaceSequence ServerWindowCompositorFrameSink::CreateSurfaceSequence() {
-  return surface_sequence_generator_.CreateSurfaceSequence();
-}
-
-ServerWindow* ServerWindowCompositorFrameSink::window() {
-  return manager_->window();
+  ServerWindow* window = manager_->window_;
+  window->delegate()->OnScheduleWindowPaint(window);
 }
 
 void ServerWindowCompositorFrameSink::DidReceiveCompositorFrameAck() {
   if (!client_ || !base::MessageLoop::current())
     return;
   client_->DidReceiveCompositorFrameAck();
 }
 
 void ServerWindowCompositorFrameSink::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   if (!client_ || !base::MessageLoop::current())
     return;
   client_->ReclaimResources(resources);
 }
 
 void ServerWindowCompositorFrameSink::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Implement this.
 }
 
 }  // namespace ws
 }  // namespace ui