| Index: blimp/client/support/compositor/blimp_embedder_compositor.cc
|
| diff --git a/blimp/client/support/compositor/blimp_embedder_compositor.cc b/blimp/client/support/compositor/blimp_embedder_compositor.cc
|
| deleted file mode 100644
|
| index c316a933aacce9228e177c25b2b2935004395df3..0000000000000000000000000000000000000000
|
| --- a/blimp/client/support/compositor/blimp_embedder_compositor.cc
|
| +++ /dev/null
|
| @@ -1,238 +0,0 @@
|
| -// 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/support/compositor/blimp_embedder_compositor.h"
|
| -
|
| -#include "base/bind.h"
|
| -#include "base/lazy_instance.h"
|
| -#include "base/memory/ptr_util.h"
|
| -#include "base/memory/weak_ptr.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/output_surface.h"
|
| -#include "cc/output/output_surface_frame.h"
|
| -#include "cc/output/texture_mailbox_deleter.h"
|
| -#include "cc/raster/single_thread_task_graph_runner.h"
|
| -#include "cc/surfaces/direct_compositor_frame_sink.h"
|
| -#include "cc/surfaces/display.h"
|
| -#include "cc/surfaces/surface_id_allocator.h"
|
| -#include "cc/surfaces/surface_manager.h"
|
| -#include "cc/trees/layer_tree_host_in_process.h"
|
| -#include "gpu/command_buffer/client/context_support.h"
|
| -#include "gpu/command_buffer/client/gles2_lib.h"
|
| -
|
| -namespace blimp {
|
| -namespace client {
|
| -
|
| -namespace {
|
| -
|
| -class SimpleTaskGraphRunner : public cc::SingleThreadTaskGraphRunner {
|
| - public:
|
| - SimpleTaskGraphRunner() {
|
| - Start("BlimpBrowserCompositorWorker",
|
| - base::SimpleThread::Options(base::ThreadPriority::BACKGROUND));
|
| - }
|
| -
|
| - ~SimpleTaskGraphRunner() override { Shutdown(); }
|
| -};
|
| -
|
| -class DisplayOutputSurface : public cc::OutputSurface {
|
| - public:
|
| - explicit DisplayOutputSurface(
|
| - scoped_refptr<cc::ContextProvider> context_provider,
|
| - scoped_refptr<base::SingleThreadTaskRunner> task_runner)
|
| - : cc::OutputSurface(std::move(context_provider)),
|
| - task_runner_(std::move(task_runner)),
|
| - weak_ptr_factory_(this) {}
|
| -
|
| - ~DisplayOutputSurface() override = default;
|
| -
|
| - // cc::OutputSurface implementation
|
| - void BindToClient(cc::OutputSurfaceClient* client) override {
|
| - client_ = client;
|
| - }
|
| -
|
| - void EnsureBackbuffer() override {}
|
| - void DiscardBackbuffer() override {
|
| - context_provider()->ContextGL()->DiscardBackbufferCHROMIUM();
|
| - }
|
| - void BindFramebuffer() override {
|
| - context_provider()->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
|
| - }
|
| - void Reshape(const gfx::Size& size,
|
| - float device_scale_factor,
|
| - const gfx::ColorSpace& color_space,
|
| - bool has_alpha) override {
|
| - context_provider()->ContextGL()->ResizeCHROMIUM(
|
| - size.width(), size.height(), device_scale_factor, has_alpha);
|
| - }
|
| - void SwapBuffers(cc::OutputSurfaceFrame frame) override {
|
| - context_provider_->ContextSupport()->Swap();
|
| - // The ack for SwapBuffers must be run asynchronously, that will be
|
| - // satisfied since we will go through a PostTask here.
|
| - task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&DisplayOutputSurface::SwapBuffersCallback,
|
| - weak_ptr_factory_.GetWeakPtr()));
|
| - }
|
| - cc::OverlayCandidateValidator* GetOverlayCandidateValidator() const override {
|
| - return nullptr;
|
| - }
|
| - bool IsDisplayedAsOverlayPlane() const override { return false; }
|
| - unsigned GetOverlayTextureId() const override { return 0; }
|
| - bool SurfaceIsSuspendForRecycle() const override { return false; }
|
| - uint32_t GetFramebufferCopyTextureFormat() override {
|
| - // We assume we have an alpha channel from the BlimpContextProvider, so use
|
| - // GL_RGBA here.
|
| - return GL_RGBA;
|
| - }
|
| - bool HasExternalStencilTest() const override { return false; }
|
| - void ApplyExternalStencil() override {}
|
| -
|
| - private:
|
| - void SwapBuffersCallback() { client_->DidReceiveSwapBuffersAck(); }
|
| -
|
| - cc::OutputSurfaceClient* client_ = nullptr;
|
| - scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| - base::WeakPtrFactory<DisplayOutputSurface> weak_ptr_factory_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(DisplayOutputSurface);
|
| -};
|
| -
|
| -base::LazyInstance<SimpleTaskGraphRunner> g_task_graph_runner =
|
| - LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -} // namespace
|
| -
|
| -BlimpEmbedderCompositor::BlimpEmbedderCompositor(
|
| - CompositorDependencies* compositor_dependencies)
|
| - : compositor_dependencies_(compositor_dependencies),
|
| - frame_sink_id_(compositor_dependencies->AllocateFrameSinkId()),
|
| - compositor_frame_sink_request_pending_(false),
|
| - root_layer_(cc::Layer::Create()) {
|
| - compositor_dependencies_->GetSurfaceManager()->RegisterFrameSinkId(
|
| - frame_sink_id_);
|
| -
|
| - animation_host_ = cc::AnimationHost::CreateMainInstance();
|
| -
|
| - cc::LayerTreeHostInProcess::InitParams params;
|
| - params.client = this;
|
| - params.task_graph_runner = g_task_graph_runner.Pointer();
|
| - cc::LayerTreeSettings settings;
|
| - params.settings = &settings;
|
| - params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
|
| - params.mutator_host = animation_host_.get();
|
| - host_ = cc::LayerTreeHostInProcess::CreateSingleThreaded(this, ¶ms);
|
| -
|
| - root_layer_->SetBackgroundColor(SK_ColorWHITE);
|
| - host_->GetLayerTree()->SetRootLayer(root_layer_);
|
| - host_->SetFrameSinkId(frame_sink_id_);
|
| - host_->SetVisible(true);
|
| -}
|
| -
|
| -BlimpEmbedderCompositor::~BlimpEmbedderCompositor() {
|
| - SetContextProvider(nullptr);
|
| - compositor_dependencies_->GetSurfaceManager()->InvalidateFrameSinkId(
|
| - frame_sink_id_);
|
| -}
|
| -
|
| -void BlimpEmbedderCompositor::SetContentLayer(
|
| - scoped_refptr<cc::Layer> content_layer) {
|
| - root_layer_->RemoveAllChildren();
|
| - root_layer_->AddChild(content_layer);
|
| -}
|
| -
|
| -void BlimpEmbedderCompositor::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 BlimpEmbedderCompositor::SetContextProvider(
|
| - scoped_refptr<cc::ContextProvider> context_provider) {
|
| - if (context_provider_) {
|
| - DCHECK(host_->IsVisible());
|
| - host_->SetVisible(false);
|
| - host_->ReleaseCompositorFrameSink();
|
| - display_.reset();
|
| - }
|
| -
|
| - context_provider_ = std::move(context_provider);
|
| -
|
| - if (context_provider_) {
|
| - host_->SetVisible(true);
|
| - if (compositor_frame_sink_request_pending_) {
|
| - HandlePendingCompositorFrameSinkRequest();
|
| - }
|
| - }
|
| -}
|
| -
|
| -void BlimpEmbedderCompositor::RequestNewCompositorFrameSink() {
|
| - DCHECK(!compositor_frame_sink_request_pending_)
|
| - << "We already have a pending request?";
|
| - compositor_frame_sink_request_pending_ = true;
|
| - HandlePendingCompositorFrameSinkRequest();
|
| -}
|
| -
|
| -void BlimpEmbedderCompositor::DidInitializeCompositorFrameSink() {
|
| - compositor_frame_sink_request_pending_ = false;
|
| -}
|
| -
|
| -void BlimpEmbedderCompositor::DidFailToInitializeCompositorFrameSink() {
|
| - NOTREACHED() << "Can't fail to initialize the CompositorFrameSink here";
|
| -}
|
| -
|
| -void BlimpEmbedderCompositor::HandlePendingCompositorFrameSinkRequest() {
|
| - DCHECK(compositor_frame_sink_request_pending_);
|
| -
|
| - // Can't handle the request right now since we don't have a widget.
|
| - if (!host_->IsVisible())
|
| - return;
|
| -
|
| - DCHECK(context_provider_);
|
| - context_provider_->BindToCurrentThread();
|
| -
|
| - gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
|
| - compositor_dependencies_->GetGpuMemoryBufferManager();
|
| - cc::SharedBitmapManager* shared_bitmap_manager = nullptr;
|
| -
|
| - auto task_runner = base::ThreadTaskRunnerHandle::Get();
|
| - auto display_output_surface =
|
| - base::MakeUnique<DisplayOutputSurface>(context_provider_, task_runner);
|
| -
|
| - begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource(
|
| - base::MakeUnique<cc::DelayBasedTimeSource>(task_runner.get())));
|
| - std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
|
| - task_runner.get(),
|
| - display_output_surface->capabilities().max_frames_pending));
|
| -
|
| - display_ = base::MakeUnique<cc::Display>(
|
| - shared_bitmap_manager, gpu_memory_buffer_manager,
|
| - host_->GetSettings().renderer_settings, frame_sink_id_,
|
| - begin_frame_source_.get(), std::move(display_output_surface),
|
| - std::move(scheduler),
|
| - base::MakeUnique<cc::TextureMailboxDeleter>(task_runner.get()));
|
| - display_->SetVisible(true);
|
| - display_->Resize(viewport_size_in_px_);
|
| -
|
| - // The Browser compositor and display share the same context provider.
|
| - auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
|
| - frame_sink_id_, compositor_dependencies_->GetSurfaceManager(),
|
| - display_.get(), context_provider_, nullptr, gpu_memory_buffer_manager,
|
| - shared_bitmap_manager);
|
| -
|
| - host_->SetCompositorFrameSink(std::move(compositor_frame_sink));
|
| -}
|
| -
|
| -} // namespace client
|
| -} // namespace blimp
|
|
|