WIP: Propagate SurfaceID up window tree hierarchy

ui/views/mus/surface_context_factory.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 "ui/views/mus/surface_context_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "services/ui/public/cpp/compositor_frame_sink.h"
@@ skipping 11 matching lines @@
   FakeReflector() {}
   ~FakeReflector() override {}
   void OnMirroringCompositorResized() override {}
   void AddMirroringLayer(ui::Layer* layer) override {}
   void RemoveMirroringLayer(ui::Layer* layer) override {}
 };
 
 }  // namespace
 
 SurfaceContextFactory::SurfaceContextFactory(ui::GpuService* gpu_service)
-    : next_surface_id_namespace_(1u), gpu_service_(gpu_service) {}
+    : surface_manager_(nullptr),
+      next_surface_id_namespace_(1u),
+      gpu_service_(gpu_service) {}
 
 SurfaceContextFactory::~SurfaceContextFactory() {}
 
 void SurfaceContextFactory::CreateCompositorFrameSink(
     base::WeakPtr<ui::Compositor> compositor) {
   ui::Window* window = compositor->window();
   NativeWidgetMus* native_widget = NativeWidgetMus::GetForWindow(window);
   ui::mojom::SurfaceType surface_type = native_widget->surface_type();
   auto compositor_frame_sink = base::MakeUnique<ui::CompositorFrameSink>(
       gpu_service_->EstablishGpuChannelSync(),
@@ skipping 39 matching lines @@
 
 gpu::GpuMemoryBufferManager*
 SurfaceContextFactory::GetGpuMemoryBufferManager() {
   return gpu_service_->gpu_memory_buffer_manager();
 }
 
 cc::TaskGraphRunner* SurfaceContextFactory::GetTaskGraphRunner() {
   return raster_thread_helper_.task_graph_runner();
 }
 
-uint32_t SurfaceContextFactory::AllocateSurfaceClientId() {
-  return next_surface_id_namespace_++;
+cc::FrameSinkId SurfaceContextFactory::AllocateFrameSinkId() {
+  return cc::FrameSinkId(next_surface_id_namespace_++, 0);
 }
 
 cc::SurfaceManager* SurfaceContextFactory::GetSurfaceManager() {
   return &surface_manager_;
 }
 
 void SurfaceContextFactory::SetDisplayVisible(ui::Compositor* compositor,
                                               bool visible) {
   // TODO(fsamuel): display[compositor]->SetVisible(visible);
 }
 
 void SurfaceContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                           const gfx::Size& size) {
   // TODO(fsamuel): display[compositor]->Resize(size);
 }
 
 }  // namespace views