WIP: Propagate SurfaceID up window tree hierarchy

services/ui/surfaces/display_compositor.cc

Index: services/ui/surfaces/display_compositor.cc
diff --git a/services/ui/surfaces/display_compositor.cc b/services/ui/surfaces/display_compositor.cc
index e5b9d9e68f41008a3a77352fd08394b61ba60636..6ae9e37758c820f516088c6f1ce60a7a55860577 100644
--- a/services/ui/surfaces/display_compositor.cc
+++ b/services/ui/surfaces/display_compositor.cc
@@ -1,138 +1,25 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// 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/surfaces/display_compositor.h"
 
-#include "cc/output/copy_output_request.h"
-#include "cc/output/output_surface.h"
-#include "cc/output/renderer_settings.h"
-#include "cc/output/texture_mailbox_deleter.h"
-#include "cc/scheduler/begin_frame_source.h"
-#include "cc/scheduler/delay_based_time_source.h"
-#include "cc/surfaces/display.h"
-#include "cc/surfaces/display_scheduler.h"
-#include "gpu/ipc/client/gpu_channel_host.h"
-#include "services/ui/surfaces/direct_output_surface.h"
-#include "services/ui/surfaces/surfaces_context_provider.h"
-
-#if defined(USE_OZONE)
-#include "gpu/command_buffer/client/gles2_interface.h"
-#include "services/ui/surfaces/direct_output_surface_ozone.h"
-#endif
+#include "services/ui/surfaces/display_compositor_client.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace ui {
+namespace surfaces {
 
-DisplayCompositor::DisplayCompositor(
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    gfx::AcceleratedWidget widget,
-    scoped_refptr<gpu::GpuChannelHost> gpu_channel,
-    const scoped_refptr<SurfacesState>& surfaces_state)
-    : task_runner_(task_runner),
-      surfaces_state_(surfaces_state),
-      factory_(surfaces_state->manager(), this),
-      allocator_(surfaces_state->next_client_id()) {
-  surfaces_state_->manager()->RegisterSurfaceClientId(allocator_.client_id());
-  surfaces_state_->manager()->RegisterSurfaceFactoryClient(
-      allocator_.client_id(), this);
-
-  gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
-      gpu_channel->gpu_memory_buffer_manager();
-  scoped_refptr<SurfacesContextProvider> surfaces_context_provider(
-      new SurfacesContextProvider(widget, std::move(gpu_channel)));
-  // TODO(rjkroege): If there is something better to do than CHECK, add it.
-  CHECK(surfaces_context_provider->BindToCurrentThread());
-
-  std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source(
-      new cc::DelayBasedBeginFrameSource(
-          base::MakeUnique<cc::DelayBasedTimeSource>(task_runner_.get())));
-
-  std::unique_ptr<cc::OutputSurface> display_output_surface;
-  if (surfaces_context_provider->ContextCapabilities().surfaceless) {
-#if defined(USE_OZONE)
-    display_output_surface = base::MakeUnique<DirectOutputSurfaceOzone>(
-        surfaces_context_provider, widget, synthetic_begin_frame_source.get(),
-        gpu_memory_buffer_manager, GL_TEXTURE_2D, GL_RGB);
-#else
-    NOTREACHED();
-#endif
-  } else {
-    display_output_surface = base::MakeUnique<DirectOutputSurface>(
-        surfaces_context_provider, synthetic_begin_frame_source.get());
-  }
-
-  int max_frames_pending =
-      display_output_surface->capabilities().max_frames_pending;
-  DCHECK_GT(max_frames_pending, 0);
-
-  std::unique_ptr<cc::DisplayScheduler> scheduler(
-      new cc::DisplayScheduler(synthetic_begin_frame_source.get(),
-                               task_runner_.get(), max_frames_pending));
+DisplayCompositor::DisplayCompositor(DisplayCompositorClient* client)
+    : client_(client), next_client_id_(1u), manager_(this) {}
 
-  display_.reset(new cc::Display(
-      nullptr /* bitmap_manager */, gpu_memory_buffer_manager,
-      cc::RendererSettings(), std::move(synthetic_begin_frame_source),
-      std::move(display_output_surface), std::move(scheduler),
-      base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get())));
-  display_->Initialize(this, surfaces_state_->manager(),
-                       allocator_.client_id());
-  display_->SetVisible(true);
-}
-
-DisplayCompositor::~DisplayCompositor() {
-  surfaces_state_->manager()->UnregisterSurfaceFactoryClient(
-      allocator_.client_id());
-  surfaces_state_->manager()->InvalidateSurfaceClientId(allocator_.client_id());
-}
-
-void DisplayCompositor::SubmitCompositorFrame(
-    cc::CompositorFrame frame,
-    const base::Callback<void()>& callback) {
-  gfx::Size frame_size =
-      frame.delegated_frame_data->render_pass_list.back()->output_rect.size();
-  if (frame_size.IsEmpty() || frame_size != display_size_) {
-    if (!surface_id_.is_null())
-      factory_.Destroy(surface_id_);
-    surface_id_ = allocator_.GenerateId();
-    factory_.Create(surface_id_);
-    display_size_ = frame_size;
-    display_->Resize(display_size_);
-  }
-  display_->SetSurfaceId(surface_id_, frame.metadata.device_scale_factor);
-  factory_.SubmitCompositorFrame(surface_id_, std::move(frame), callback);
-}
-
-void DisplayCompositor::RequestCopyOfOutput(
-    std::unique_ptr<cc::CopyOutputRequest> output_request) {
-  factory_.RequestCopyOfSurface(surface_id_, std::move(output_request));
-}
-
-void DisplayCompositor::ReturnResources(
-    const cc::ReturnedResourceArray& resources) {
-  // TODO(fsamuel): Implement this.
-}
-
-void DisplayCompositor::SetBeginFrameSource(
-    cc::BeginFrameSource* begin_frame_source) {
-  // TODO(fsamuel): Implement this.
-}
-
-void DisplayCompositor::DisplayOutputSurfaceLost() {
-  // TODO(fsamuel): This looks like it would crash if a frame was in flight and
-  // will be submitted.
-  display_.reset();
-}
-
-void DisplayCompositor::DisplayWillDrawAndSwap(
-    bool will_draw_and_swap,
-    const cc::RenderPassList& render_passes) {
-  // This notification is not relevant to our client outside of tests.
-}
+DisplayCompositor::~DisplayCompositor() {}
 
-void DisplayCompositor::DisplayDidDrawAndSwap() {
-  // This notification is not relevant to our client outside of tests. We
-  // unblock the client from the DrawCallback when the surface is going to
-  // be drawn.
+void DisplayCompositor::OnSurfaceCreated(const gfx::Size& size,
+                                         float device_scale_factor,
+                                         const cc::SurfaceId& surface_id) {
+  client_->OnSurfaceCreated(size, device_scale_factor, surface_id);
 }
 
+}  // namespace surfaces
 }  // namespace ui