| Index: content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.cc b/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| index 8c4d6cdfc1575fe3b405c279924cb807ab3105d9..5b8d2ce41b1b981747372726e8b3c975fa0cc6d9 100644
|
| --- a/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| +++ b/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| @@ -9,6 +9,7 @@
|
| #include "build/build_config.h"
|
| #include "cc/output/context_provider.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| +#include "components/display_compositor/display_compositor.h"
|
| #include "components/display_compositor/gl_helper.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "ui/compositor/compositor.h"
|
| @@ -17,11 +18,16 @@
|
| namespace content {
|
|
|
| NoTransportImageTransportFactory::NoTransportImageTransportFactory()
|
| - : surface_manager_(new cc::SurfaceManager),
|
| - // The context factory created here is for unit tests, thus passing in
|
| - // true in constructor.
|
| - context_factory_(
|
| - new ui::InProcessContextFactory(true, surface_manager_.get())) {}
|
| + : display_compositor_client_binding_(this) {
|
| + display_compositor_ = base::MakeUnique<display_compositor::DisplayCompositor>(
|
| + MakeRequest(&display_compositor_ptr_),
|
| + display_compositor_client_binding_.CreateInterfacePtrAndBind());
|
| +
|
| + // The context factory created here is for unit tests, thus passing in
|
| + // true in constructor.
|
| + context_factory_ = base::MakeUnique<ui::InProcessContextFactory>(
|
| + true, display_compositor_.get());
|
| +}
|
|
|
| NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {
|
| std::unique_ptr<display_compositor::GLHelper> lost_gl_helper =
|
| @@ -50,4 +56,7 @@ display_compositor::GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
|
| void NoTransportImageTransportFactory::SetGpuChannelEstablishFactory(
|
| gpu::GpuChannelEstablishFactory* factory) {}
|
|
|
| +void NoTransportImageTransportFactory::OnSurfaceCreated(
|
| + const cc::SurfaceInfo& surface_info) {}
|
| +
|
| } // namespace content
|
|
|