Skip to content

GitLab

T
tangled
Commit 3cf0cf68 authored by kylechar's avatar kylechar Committed by Commit bot
Browse files
Options

Create //components/viz/frame_sinks and move code. 

Move all of the existing code for what used to be called
DisplayCompositor and is now MojoFrameSinkManager from various places to
a single target under src/components/viz/. This is the chunk of code that
both mus and non-mus will use to implement the FrameSinkManager
interface.

BUG=664547

Review-Url: https://codereview.chromium.org/2795823003
Cr-Commit-Position: refs/heads/master@{#462633}
parent 46aa9d9d
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 68 deletions
components/display_compositor/BUILD.gn
View file @ 3cf0cf68
...@@ -17,11 +17,6 @@ component("display_compositor") { ...@@ -17,11 +17,6 @@ component("display_compositor") {
"gl_helper_readback_support.h", "gl_helper_readback_support.h",
"gl_helper_scaling.cc", "gl_helper_scaling.cc",
"gl_helper_scaling.h", "gl_helper_scaling.h",
"gpu_compositor_frame_sink.cc",
"gpu_compositor_frame_sink.h",
"gpu_compositor_frame_sink_delegate.h",
"gpu_root_compositor_frame_sink.cc",
"gpu_root_compositor_frame_sink.h",
] ]
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
......
components/viz/DEPS 0 → 100644
View file @ 3cf0cf68
include_rules = [
"+gpu",
"+mojo/public",
]
components/viz/frame_sinks/BUILD.gn 0 → 100644
View file @ 3cf0cf68
# Copyright 2017 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.
source_set("frame_sinks") {
sources = [
"display_provider.h",
"gpu_compositor_frame_sink.cc",
"gpu_compositor_frame_sink.h",
"gpu_compositor_frame_sink_delegate.h",
"gpu_root_compositor_frame_sink.cc",
"gpu_root_compositor_frame_sink.h",
"mojo_frame_sink_manager.cc",
"mojo_frame_sink_manager.h",
]
deps = [
"//base",
"//cc",
"//cc/ipc:interfaces",
"//cc/surfaces",
"//components/display_compositor",
"//gpu/ipc:command_buffer",
]
}
components/viz/frame_sinks/DEPS 0 → 100644
View file @ 3cf0cf68
include_rules = [
"+cc/base",
"+cc/ipc",
"+cc/surfaces",
"+cc/scheduler",
]
services/ui/surfaces/display_provider.h → components/viz/frame_sinks/display_provider.h
View file @ 3cf0cf68
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef SERVICES_UI_SURFACES_DISPLAY_PROVIDER_H_ #ifndef COMPONENTS_VIZ_FRAME_SINKS_DISPLAY_PROVIDER_H_
#define SERVICES_UI_SURFACES_DISPLAY_PROVIDER_H_ #define COMPONENTS_VIZ_FRAME_SINKS_DISPLAY_PROVIDER_H_
#include <memory> #include <memory>
...@@ -15,7 +15,7 @@ class Display; ...@@ -15,7 +15,7 @@ class Display;
class FrameSinkId; class FrameSinkId;
} }
namespace ui { namespace viz {
// Handles creating new cc::Displays and related classes for // Handles creating new cc::Displays and related classes for
// MojoFrameSinkManager. // MojoFrameSinkManager.
...@@ -31,6 +31,6 @@ class DisplayProvider { ...@@ -31,6 +31,6 @@ class DisplayProvider {
std::unique_ptr<cc::BeginFrameSource>* begin_frame_source) = 0; std::unique_ptr<cc::BeginFrameSource>* begin_frame_source) = 0;
}; };
} // namespace ui } // namespace viz
#endif // SERVICES_UI_SURFACES_DISPLAY_PROVIDER_H_ #endif // COMPONENTS_VIZ_FRAME_SINKS_DISPLAY_PROVIDER_H_
components/display_compositor/gpu_compositor_frame_sink.cc → components/viz/frame_sinks/gpu_compositor_frame_sink.cc
View file @ 3cf0cf68
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "components/display_compositor/gpu_compositor_frame_sink.h" #include "components/viz/frame_sinks/gpu_compositor_frame_sink.h"
namespace display_compositor { namespace viz {
GpuCompositorFrameSink::GpuCompositorFrameSink( GpuCompositorFrameSink::GpuCompositorFrameSink(
GpuCompositorFrameSinkDelegate* delegate, GpuCompositorFrameSinkDelegate* delegate,
...@@ -102,4 +102,4 @@ void GpuCompositorFrameSink::OnPrivateConnectionLost() { ...@@ -102,4 +102,4 @@ void GpuCompositorFrameSink::OnPrivateConnectionLost() {
client_connection_lost_); client_connection_lost_);
} }
} // namespace display_compositor } // namespace viz
components/display_compositor/gpu_compositor_frame_sink.h → components/viz/frame_sinks/gpu_compositor_frame_sink.h
View file @ 3cf0cf68
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_ #ifndef COMPONENTS_VIZ_FRAME_SINKS_GPU_COMPOSITOR_FRAME_SINK_H_
#define COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_ #define COMPONENTS_VIZ_FRAME_SINKS_GPU_COMPOSITOR_FRAME_SINK_H_
#include <memory> #include <memory>
#include <vector> #include <vector>
...@@ -15,14 +15,13 @@ ...@@ -15,14 +15,13 @@
#include "cc/surfaces/compositor_frame_sink_support_client.h" #include "cc/surfaces/compositor_frame_sink_support_client.h"
#include "cc/surfaces/local_surface_id.h" #include "cc/surfaces/local_surface_id.h"
#include "cc/surfaces/surface_id.h" #include "cc/surfaces/surface_id.h"
#include "components/display_compositor/display_compositor_export.h" #include "components/viz/frame_sinks/gpu_compositor_frame_sink_delegate.h"
#include "components/display_compositor/gpu_compositor_frame_sink_delegate.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
namespace display_compositor { namespace viz {
// Server side representation of a WindowSurface. // Server side representation of a WindowSurface.
class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink class GpuCompositorFrameSink
: public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient), : public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient),
public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSink), public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSink),
public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSinkPrivate) { public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSinkPrivate) {
...@@ -75,6 +74,6 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink ...@@ -75,6 +74,6 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink); DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink);
}; };
} // namespace display_compositor } // namespace viz
#endif // COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_ #endif // COMPONENTS_VIZ_FRAME_SINKS_GPU_COMPOSITOR_FRAME_SINK_H_
components/display_compositor/gpu_compositor_frame_sink_delegate.h → components/viz/frame_sinks/gpu_compositor_frame_sink_delegate.h
View file @ 3cf0cf68
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_DELEGATE_H_ #ifndef COMPONENTS_VIZ_FRAME_SINKS_GPU_COMPOSITOR_FRAME_SINK_DELEGATE_H_
#define COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_DELEGATE_H_ #define COMPONENTS_VIZ_FRAME_SINKS_GPU_COMPOSITOR_FRAME_SINK_DELEGATE_H_
namespace cc { namespace cc {
class FrameSinkId; class FrameSinkId;
} }
namespace display_compositor { namespace viz {
class GpuCompositorFrameSinkDelegate { class GpuCompositorFrameSinkDelegate {
public: public:
...@@ -25,6 +25,6 @@ class GpuCompositorFrameSinkDelegate { ...@@ -25,6 +25,6 @@ class GpuCompositorFrameSinkDelegate {
virtual ~GpuCompositorFrameSinkDelegate() {} virtual ~GpuCompositorFrameSinkDelegate() {}
}; };
} // namespace display_compositor } // namespace viz
#endif // COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_DELEGATE_H_ #endif // COMPONENTS_VIZ_FRAME_SINKS_GPU_COMPOSITOR_FRAME_SINK_DELEGATE_H_
components/display_compositor/gpu_root_compositor_frame_sink.cc → components/viz/frame_sinks/gpu_root_compositor_frame_sink.cc
View file @ 3cf0cf68
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "components/display_compositor/gpu_root_compositor_frame_sink.h" #include "components/viz/frame_sinks/gpu_root_compositor_frame_sink.h"
#include "cc/surfaces/compositor_frame_sink_support.h" #include "cc/surfaces/compositor_frame_sink_support.h"
#include "cc/surfaces/display.h" #include "cc/surfaces/display.h"
namespace display_compositor { namespace viz {
GpuRootCompositorFrameSink::GpuRootCompositorFrameSink( GpuRootCompositorFrameSink::GpuRootCompositorFrameSink(
GpuCompositorFrameSinkDelegate* delegate, GpuCompositorFrameSinkDelegate* delegate,
...@@ -152,4 +152,4 @@ void GpuRootCompositorFrameSink::OnPrivateConnectionLost() { ...@@ -152,4 +152,4 @@ void GpuRootCompositorFrameSink::OnPrivateConnectionLost() {
client_connection_lost_); client_connection_lost_);
} }
} // namespace display_compositor } // namespace viz
components/display_compositor/gpu_root_compositor_frame_sink.h → components/viz/frame_sinks/gpu_root_compositor_frame_sink.h
View file @ 3cf0cf68
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef COMPONENTS_DISPLAY_COMPOSITOR_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_ #ifndef COMPONENTS_VIZ_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_
#define COMPONENTS_DISPLAY_COMPOSITOR_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_ #define COMPONENTS_VIZ_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_
#include "cc/ipc/frame_sink_manager.mojom.h" #include "cc/ipc/frame_sink_manager.mojom.h"
#include "cc/ipc/mojo_compositor_frame_sink.mojom.h" #include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
#include "cc/surfaces/display_client.h" #include "cc/surfaces/display_client.h"
#include "cc/surfaces/local_surface_id.h" #include "cc/surfaces/local_surface_id.h"
#include "cc/surfaces/surface_id.h" #include "cc/surfaces/surface_id.h"
#include "components/display_compositor/display_compositor_export.h" #include "components/viz/frame_sinks/gpu_compositor_frame_sink_delegate.h"
#include "components/display_compositor/gpu_compositor_frame_sink_delegate.h"
#include "mojo/public/cpp/bindings/associated_binding.h" #include "mojo/public/cpp/bindings/associated_binding.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
...@@ -23,11 +22,11 @@ class Display; ...@@ -23,11 +22,11 @@ class Display;
class SurfaceManager; class SurfaceManager;
} }
namespace display_compositor { namespace viz {
class GpuCompositorFrameSinkDelegate; class GpuCompositorFrameSinkDelegate;
class DISPLAY_COMPOSITOR_EXPORT GpuRootCompositorFrameSink class GpuRootCompositorFrameSink
: public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient), : public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient),
public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSink), public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSink),
public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSinkPrivate), public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSinkPrivate),
...@@ -105,6 +104,6 @@ class DISPLAY_COMPOSITOR_EXPORT GpuRootCompositorFrameSink ...@@ -105,6 +104,6 @@ class DISPLAY_COMPOSITOR_EXPORT GpuRootCompositorFrameSink
DISALLOW_COPY_AND_ASSIGN(GpuRootCompositorFrameSink); DISALLOW_COPY_AND_ASSIGN(GpuRootCompositorFrameSink);
}; };
} // namespace display_compositor } // namespace viz
#endif // COMPONENTS_DISPLAY_COMPOSITOR_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_ #endif // COMPONENTS_VIZ_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_
services/ui/surfaces/mojo_frame_sink_manager.cc → components/viz/frame_sinks/mojo_frame_sink_manager.cc
View file @ 3cf0cf68
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "services/ui/surfaces/mojo_frame_sink_manager.h" #include "components/viz/frame_sinks/mojo_frame_sink_manager.h"
#include <utility> #include <utility>
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#include "cc/scheduler/begin_frame_source.h" #include "cc/scheduler/begin_frame_source.h"
#include "cc/surfaces/display.h" #include "cc/surfaces/display.h"
#include "cc/surfaces/surface_dependency_tracker.h" #include "cc/surfaces/surface_dependency_tracker.h"
#include "components/display_compositor/gpu_compositor_frame_sink.h" #include "components/viz/frame_sinks/display_provider.h"
#include "components/display_compositor/gpu_root_compositor_frame_sink.h" #include "components/viz/frame_sinks/gpu_compositor_frame_sink.h"
#include "services/ui/surfaces/display_provider.h" #include "components/viz/frame_sinks/gpu_root_compositor_frame_sink.h"
namespace ui { namespace viz {
MojoFrameSinkManager::MojoFrameSinkManager( MojoFrameSinkManager::MojoFrameSinkManager(
DisplayProvider* display_provider, DisplayProvider* display_provider,
...@@ -61,7 +61,7 @@ void MojoFrameSinkManager::CreateRootCompositorFrameSink( ...@@ -61,7 +61,7 @@ void MojoFrameSinkManager::CreateRootCompositorFrameSink(
} }
compositor_frame_sinks_[frame_sink_id] = compositor_frame_sinks_[frame_sink_id] =
base::MakeUnique<display_compositor::GpuRootCompositorFrameSink>( base::MakeUnique<GpuRootCompositorFrameSink>(
this, &manager_, frame_sink_id, std::move(display), this, &manager_, frame_sink_id, std::move(display),
std::move(begin_frame_source), std::move(request), std::move(begin_frame_source), std::move(request),
std::move(private_request), std::move(client), std::move(private_request), std::move(client),
...@@ -77,7 +77,7 @@ void MojoFrameSinkManager::CreateCompositorFrameSink( ...@@ -77,7 +77,7 @@ void MojoFrameSinkManager::CreateCompositorFrameSink(
DCHECK_EQ(0u, compositor_frame_sinks_.count(frame_sink_id)); DCHECK_EQ(0u, compositor_frame_sinks_.count(frame_sink_id));
compositor_frame_sinks_[frame_sink_id] = compositor_frame_sinks_[frame_sink_id] =
base::MakeUnique<display_compositor::GpuCompositorFrameSink>( base::MakeUnique<GpuCompositorFrameSink>(
this, &manager_, frame_sink_id, std::move(request), this, &manager_, frame_sink_id, std::move(request),
std::move(private_request), std::move(client)); std::move(private_request), std::move(client));
} }
...@@ -141,4 +141,4 @@ void MojoFrameSinkManager::OnPrivateConnectionLost( ...@@ -141,4 +141,4 @@ void MojoFrameSinkManager::OnPrivateConnectionLost(
DestroyCompositorFrameSink(frame_sink_id); DestroyCompositorFrameSink(frame_sink_id);
} }
} // namespace ui } // namespace viz
services/ui/surfaces/mojo_frame_sink_manager.h → components/viz/frame_sinks/mojo_frame_sink_manager.h
View file @ 3cf0cf68
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef SERVICES_UI_SURFACES_MOJO_FRAME_SINK_MANAGER_H_ #ifndef COMPONENTS_VIZ_FRAME_SINKS_MOJO_FRAME_SINK_MANAGER_H_
#define SERVICES_UI_SURFACES_MOJO_FRAME_SINK_MANAGER_H_ #define COMPONENTS_VIZ_FRAME_SINKS_MOJO_FRAME_SINK_MANAGER_H_
#include <stdint.h> #include <stdint.h>
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
#include "cc/surfaces/frame_sink_id.h" #include "cc/surfaces/frame_sink_id.h"
#include "cc/surfaces/surface_manager.h" #include "cc/surfaces/surface_manager.h"
#include "cc/surfaces/surface_observer.h" #include "cc/surfaces/surface_observer.h"
#include "components/display_compositor/gpu_compositor_frame_sink_delegate.h" #include "components/viz/frame_sinks/gpu_compositor_frame_sink_delegate.h"
#include "gpu/ipc/common/surface_handle.h" #include "gpu/ipc/common/surface_handle.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
namespace ui { namespace viz {
class DisplayProvider; class DisplayProvider;
...@@ -32,10 +32,9 @@ class DisplayProvider; ...@@ -32,10 +32,9 @@ class DisplayProvider;
// will be true after the mus process split. For non-mus Chrome this will be // will be true after the mus process split. For non-mus Chrome this will be
// created in the browser process, at least until GPU implementations can be // created in the browser process, at least until GPU implementations can be
// unified. // unified.
class MojoFrameSinkManager class MojoFrameSinkManager : public cc::SurfaceObserver,
: public cc::SurfaceObserver, public GpuCompositorFrameSinkDelegate,
public display_compositor::GpuCompositorFrameSinkDelegate, public cc::mojom::FrameSinkManager {
public cc::mojom::FrameSinkManager {
public: public:
MojoFrameSinkManager(DisplayProvider* display_provider, MojoFrameSinkManager(DisplayProvider* display_provider,
cc::mojom::FrameSinkManagerRequest request, cc::mojom::FrameSinkManagerRequest request,
...@@ -79,7 +78,7 @@ class MojoFrameSinkManager ...@@ -79,7 +78,7 @@ class MojoFrameSinkManager
void OnSurfaceDamaged(const cc::SurfaceId& surface_id, void OnSurfaceDamaged(const cc::SurfaceId& surface_id,
bool* changed) override; bool* changed) override;
// display_compositor::GpuCompositorFrameSinkDelegate implementation. // GpuCompositorFrameSinkDelegate implementation.
void OnClientConnectionLost(const cc::FrameSinkId& frame_sink_id, void OnClientConnectionLost(const cc::FrameSinkId& frame_sink_id,
bool destroy_compositor_frame_sink) override; bool destroy_compositor_frame_sink) override;
void OnPrivateConnectionLost(const cc::FrameSinkId& frame_sink_id, void OnPrivateConnectionLost(const cc::FrameSinkId& frame_sink_id,
...@@ -106,6 +105,6 @@ class MojoFrameSinkManager ...@@ -106,6 +105,6 @@ class MojoFrameSinkManager
DISALLOW_COPY_AND_ASSIGN(MojoFrameSinkManager); DISALLOW_COPY_AND_ASSIGN(MojoFrameSinkManager);
}; };
} // namespace ui } // namespace viz
#endif // SERVICES_UI_SURFACES_MOJO_FRAME_SINK_MANAGER_H_ #endif // COMPONENTS_VIZ_FRAME_SINKS_MOJO_FRAME_SINK_MANAGER_H_
services/ui/gpu/BUILD.gn
View file @ 3cf0cf68
...@@ -20,6 +20,7 @@ source_set("gpu") { ...@@ -20,6 +20,7 @@ source_set("gpu") {
deps = [ deps = [
"//cc", "//cc",
"//components/viz/frame_sinks",
"//gpu/ipc:command_buffer", "//gpu/ipc:command_buffer",
"//gpu/ipc/common", "//gpu/ipc/common",
"//gpu/ipc/service", "//gpu/ipc/service",
......
services/ui/gpu/DEPS
View file @ 3cf0cf68
include_rules = [ include_rules = [
"+components/viz",
"+gpu/command_buffer", "+gpu/command_buffer",
"+gpu/config", "+gpu/config",
"+gpu/ipc", "+gpu/ipc",
......
services/ui/gpu/gpu_main.cc
View file @ 3cf0cf68
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/power_monitor/power_monitor_device_source.h" #include "base/power_monitor/power_monitor_device_source.h"
#include "components/viz/frame_sinks/mojo_frame_sink_manager.h"
#include "gpu/command_buffer/common/activity_flags.h" #include "gpu/command_buffer/common/activity_flags.h"
#include "gpu/ipc/common/gpu_memory_buffer_support.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h"
#include "gpu/ipc/gpu_in_process_thread_service.h" #include "gpu/ipc/gpu_in_process_thread_service.h"
...@@ -210,7 +211,7 @@ void GpuMain::CreateFrameSinkManagerOnCompositorThread( ...@@ -210,7 +211,7 @@ void GpuMain::CreateFrameSinkManagerOnCompositorThread(
1 /* client_id */), 1 /* client_id */),
image_factory); image_factory);
frame_sink_manager_ = base::MakeUnique<MojoFrameSinkManager>( frame_sink_manager_ = base::MakeUnique<viz::MojoFrameSinkManager>(
display_provider_.get(), std::move(request), std::move(client)); display_provider_.get(), std::move(request), std::move(client));
} }
......
services/ui/gpu/gpu_main.h
View file @ 3cf0cf68
...@@ -9,16 +9,20 @@ ...@@ -9,16 +9,20 @@
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "gpu/ipc/in_process_command_buffer.h" #include "gpu/ipc/in_process_command_buffer.h"
#include "gpu/ipc/service/gpu_init.h" #include "gpu/ipc/service/gpu_init.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/ui/gpu/interfaces/gpu_main.mojom.h" #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
#include "services/ui/gpu/interfaces/gpu_service.mojom.h" #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
#include "services/ui/surfaces/display_provider.h"
#include "services/ui/surfaces/mojo_frame_sink_manager.h"
namespace gpu { namespace gpu {
class GpuMemoryBufferFactory; class GpuMemoryBufferFactory;
class ImageFactory; class ImageFactory;
} }
namespace viz {
class DisplayProvider;
class MojoFrameSinkManager;
}
namespace ui { namespace ui {
class GpuService; class GpuService;
...@@ -85,8 +89,8 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain { ...@@ -85,8 +89,8 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
pending_frame_sink_manager_client_info_; pending_frame_sink_manager_client_info_;
// Provides mojo interfaces for creating and managing FrameSinks. // Provides mojo interfaces for creating and managing FrameSinks.
std::unique_ptr<MojoFrameSinkManager> frame_sink_manager_; std::unique_ptr<viz::MojoFrameSinkManager> frame_sink_manager_;
std::unique_ptr<DisplayProvider> display_provider_; std::unique_ptr<viz::DisplayProvider> display_provider_;
std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_; std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
......
services/ui/surfaces/BUILD.gn
View file @ 3cf0cf68
...@@ -8,9 +8,6 @@ source_set("surfaces") { ...@@ -8,9 +8,6 @@ source_set("surfaces") {
sources = [ sources = [
"display_output_surface.cc", "display_output_surface.cc",
"display_output_surface.h", "display_output_surface.h",
"display_provider.h",
"mojo_frame_sink_manager.cc",
"mojo_frame_sink_manager.h",
"mus_display_provider.cc", "mus_display_provider.cc",
"mus_display_provider.h", "mus_display_provider.h",
] ]
...@@ -21,6 +18,7 @@ source_set("surfaces") { ...@@ -21,6 +18,7 @@ source_set("surfaces") {
"//cc/ipc:interfaces", "//cc/ipc:interfaces",
"//cc/surfaces", "//cc/surfaces",
"//components/display_compositor", "//components/display_compositor",
"//components/viz/frame_sinks",
"//gpu/command_buffer/client", "//gpu/command_buffer/client",
"//gpu/command_buffer/client:gles2_interface", "//gpu/command_buffer/client:gles2_interface",
"//gpu/ipc:command_buffer", "//gpu/ipc:command_buffer",
......
services/ui/surfaces/DEPS
View file @ 3cf0cf68
include_rules = [ include_rules = [
"+cc", "+cc",
"+components/display_compositor", "+components/display_compositor",
"+components/gpu", "+components/viz/frame_sinks",
"+gpu", "+gpu",
"+services/service_manager", "+services/service_manager",
"+mojo/common", "+mojo/common",
......
services/ui/surfaces/mus_display_provider.cc
View file @ 3cf0cf68
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "cc/scheduler/begin_frame_source.h" #include "cc/scheduler/begin_frame_source.h"
#include "cc/surfaces/display.h" #include "cc/surfaces/display.h"
#include "cc/surfaces/display_scheduler.h" #include "cc/surfaces/display_scheduler.h"
#include "components/display_compositor/gpu_root_compositor_frame_sink.h"
#include "gpu/command_buffer/client/shared_memory_limits.h" #include "gpu/command_buffer/client/shared_memory_limits.h"
#include "gpu/command_buffer/service/image_factory.h" #include "gpu/command_buffer/service/image_factory.h"
#include "services/ui/surfaces/display_output_surface.h" #include "services/ui/surfaces/display_output_surface.h"
......
services/ui/surfaces/mus_display_provider.h
View file @ 3cf0cf68
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "cc/surfaces/frame_sink_id.h" #include "cc/surfaces/frame_sink_id.h"
#include "components/viz/frame_sinks/display_provider.h"
#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
#include "gpu/ipc/common/surface_handle.h" #include "gpu/ipc/common/surface_handle.h"
#include "gpu/ipc/in_process_command_buffer.h" #include "gpu/ipc/in_process_command_buffer.h"
#include "services/ui/surfaces/display_provider.h"
namespace gpu { namespace gpu {
class ImageFactory; class ImageFactory;
...@@ -23,7 +23,7 @@ class ImageFactory; ...@@ -23,7 +23,7 @@ class ImageFactory;
namespace ui { namespace ui {
// Mus implementation of DisplayProvider. This will be created in mus-gpu. // Mus implementation of DisplayProvider. This will be created in mus-gpu.
class MusDisplayProvider : public NON_EXPORTED_BASE(DisplayProvider) { class MusDisplayProvider : public NON_EXPORTED_BASE(viz::DisplayProvider) {
public: public:
MusDisplayProvider( MusDisplayProvider(
scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service, scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment