Add a full Blimp integration test.

blimp/client/support/compositor/display_compositor.cc

 // Copyright 2016 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 "blimp/client/app/compositor/browser_compositor.h"
+#include "blimp/client/support/compositor/display_compositor.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
 #include "blimp/client/support/compositor/blimp_context_provider.h"
 #include "cc/animation/animation_host.h"
 #include "cc/layers/layer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 44 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisplayOutputSurface);
 };
 
 base::LazyInstance<SimpleTaskGraphRunner> g_task_graph_runner =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
-BrowserCompositor::BrowserCompositor(
+DisplayCompositor::DisplayCompositor(
     CompositorDependencies* compositor_dependencies)
     : compositor_dependencies_(compositor_dependencies),
       surface_id_allocator_(base::MakeUnique<cc::SurfaceIdAllocator>(
           compositor_dependencies->AllocateSurfaceClientId())),
-      widget_(gfx::kNullAcceleratedWidget),
       output_surface_request_pending_(false),
       root_layer_(cc::Layer::Create()) {
   compositor_dependencies_->GetSurfaceManager()->RegisterSurfaceClientId(
       surface_id_allocator_->client_id());
 
   cc::LayerTreeHost::InitParams params;
   params.client = this;
   params.gpu_memory_buffer_manager =
       compositor_dependencies_->GetGpuMemoryBufferManager();
   params.task_graph_runner = g_task_graph_runner.Pointer();
   cc::LayerTreeSettings settings;
   params.settings = &settings;
   params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
   params.animation_host = cc::AnimationHost::CreateMainInstance();
   host_ = cc::LayerTreeHost::CreateSingleThreaded(this, &params);
 
   root_layer_->SetBackgroundColor(SK_ColorWHITE);
   host_->GetLayerTree()->SetRootLayer(root_layer_);
   host_->set_surface_client_id(surface_id_allocator_->client_id());
+  host_->SetVisible(true);
 }
 
-BrowserCompositor::~BrowserCompositor() {
+DisplayCompositor::~DisplayCompositor() {
+  SetContextProvider(nullptr);
   compositor_dependencies_->GetSurfaceManager()->InvalidateSurfaceClientId(
       surface_id_allocator_->client_id());
 }
 
-void BrowserCompositor::SetContentLayer(
+void DisplayCompositor::SetContentLayer(
     scoped_refptr<cc::Layer> content_layer) {
   root_layer_->RemoveAllChildren();
   root_layer_->AddChild(content_layer);
 }
 
-void BrowserCompositor::SetSize(const gfx::Size& size_in_px) {
+void DisplayCompositor::SetSize(const gfx::Size& size_in_px) {
   viewport_size_in_px_ = size_in_px;
 
   // Update the host.
   host_->GetLayerTree()->SetViewportSize(viewport_size_in_px_);
   root_layer_->SetBounds(viewport_size_in_px_);
 
   // Update the display.
   if (display_) {
     display_->Resize(viewport_size_in_px_);
   }
 }
 
-void BrowserCompositor::SetAcceleratedWidget(gfx::AcceleratedWidget widget) {
-  // Kill all references to the old widget.
-  if (widget_ != gfx::kNullAcceleratedWidget) {
-    // We are always visible if we have a widget.
+void DisplayCompositor::SetContextProvider(
+    scoped_refptr<cc::ContextProvider> context_provider) {
+  if (context_provider_) {
     DCHECK(host_->visible());
     host_->SetVisible(false);
     host_->ReleaseOutputSurface();
     display_.reset();
   }
 
-  widget_ = gfx::kNullAcceleratedWidget;
+  context_provider_ = nullptr;

[Khushal, 2016/09/13 04:47:24]

How about just doing context_provider_ = std::move(context_provider) here and
doing an

if (context_provider_) in the next block?

[David Trainor- moved to gerrit, 2016/09/13 06:18:04]

Done.

 
-  if (widget != gfx::kNullAcceleratedWidget) {
-    widget_ = widget;
+  if (context_provider) {
+    context_provider_ = context_provider;
     host_->SetVisible(true);
     if (output_surface_request_pending_) {
       HandlePendingOutputSurfaceRequest();
     }
   }
+
+  context_provider_ = context_provider;
+  host_->SetVisible(true);

[Khushal, 2016/09/13 04:47:24]

Eek. Don't do these 2 lines.

[David Trainor- moved to gerrit, 2016/09/13 06:18:04]

Hahah yeah caught this earlier too.

 }
 
-void BrowserCompositor::RequestNewOutputSurface() {
+void DisplayCompositor::RequestNewOutputSurface() {
   DCHECK(!output_surface_request_pending_)
       << "We already have a pending request?";
   output_surface_request_pending_ = true;
   HandlePendingOutputSurfaceRequest();
 }
 
-void BrowserCompositor::DidInitializeOutputSurface() {
+void DisplayCompositor::DidInitializeOutputSurface() {
   output_surface_request_pending_ = false;
 }
 
-void BrowserCompositor::DidFailToInitializeOutputSurface() {
+void DisplayCompositor::DidFailToInitializeOutputSurface() {
   NOTREACHED() << "Can't fail to initialize the OutputSurface here";
 }
 
-void BrowserCompositor::DidCompleteSwapBuffers() {
-  if (!did_complete_swap_buffers_.is_null()) {
-    did_complete_swap_buffers_.Run();
-  }
-}
-
-void BrowserCompositor::HandlePendingOutputSurfaceRequest() {
+void DisplayCompositor::HandlePendingOutputSurfaceRequest() {
   DCHECK(output_surface_request_pending_);
 
   // Can't handle the request right now since we don't have a widget.
   if (!host_->visible())
     return;
 
-  DCHECK_NE(gfx::kNullAcceleratedWidget, widget_);
+  DCHECK(context_provider_);
 
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       compositor_dependencies_->GetGpuMemoryBufferManager();
 
-  scoped_refptr<cc::ContextProvider> context_provider =
-      BlimpContextProvider::Create(widget_, gpu_memory_buffer_manager);
-
   std::unique_ptr<cc::OutputSurface> display_output_surface =
-      base::MakeUnique<DisplayOutputSurface>(context_provider);
+      base::MakeUnique<DisplayOutputSurface>(context_provider_);
 
   auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
   std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source(
       new cc::DelayBasedBeginFrameSource(
           base::MakeUnique<cc::DelayBasedTimeSource>(task_runner)));
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
       begin_frame_source.get(), task_runner,
       display_output_surface->capabilities().max_frames_pending));
 
   display_ = base::MakeUnique<cc::Display>(
       nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager,
       host_->settings().renderer_settings, std::move(begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner));
   display_->SetVisible(true);
   display_->Resize(viewport_size_in_px_);
 
   // The Browser compositor and display share the same context provider.
   std::unique_ptr<cc::OutputSurface> delegated_output_surface =
       base::MakeUnique<cc::SurfaceDisplayOutputSurface>(
           compositor_dependencies_->GetSurfaceManager(),
-          surface_id_allocator_.get(), display_.get(), context_provider,
+          surface_id_allocator_.get(), display_.get(), context_provider_,
           nullptr);
 
   host_->SetOutputSurface(std::move(delegated_output_surface));
 }
 
 }  // namespace client
 }  // namespace blimp