Revert of Mus+Ash: propagate Surface ID to parents

services/ui/ws/server_window_surface.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_surface.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 12 matching lines @@
     mojo::InterfaceRequest<Surface> request,
     mojom::SurfaceClientPtr client)
     : frame_sink_id_(frame_sink_id),
       manager_(manager),
       surface_factory_(frame_sink_id_, manager_->GetSurfaceManager(), this),
       client_(std::move(client)),
       binding_(this, std::move(request)) {
   cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
   surface_manager->RegisterFrameSinkId(frame_sink_id_);
   surface_manager->RegisterSurfaceFactoryClient(frame_sink_id_, this);
-  surface_sequence_generator_.set_frame_sink_id(frame_sink_id_);
 }
 
 ServerWindowSurface::~ServerWindowSurface() {
   // 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_->GetSurfaceManager();
   surface_manager->UnregisterSurfaceFactoryClient(frame_sink_id_);
   surface_manager->InvalidateFrameSinkId(frame_sink_id_);
@@ skipping 18 matching lines @@
   last_submitted_frame_size_ = frame_size;
   window()->delegate()->OnScheduleWindowPaint(window());
 }
 
 cc::SurfaceId ServerWindowSurface::GetSurfaceId() const {
   if (local_frame_id_.is_null())
     return cc::SurfaceId();
   return cc::SurfaceId(frame_sink_id_, local_frame_id_);
 }
 
-cc::SurfaceSequence ServerWindowSurface::CreateSurfaceSequence() {
-  return surface_sequence_generator_.CreateSurfaceSequence();
-}
-
 ServerWindow* ServerWindowSurface::window() {
   return manager_->window();
 }
 
 void ServerWindowSurface::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   if (!client_ || !base::MessageLoop::current())
     return;
   client_->ReturnResources(mojo::Array<cc::ReturnedResource>::From(resources));
 }
 
 void ServerWindowSurface::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Implement this.
 }
 
 }  // namespace ws
 }  // namespace ui