Index: content/browser/compositor/gpu_process_transport_factory.cc |
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc |
index 54b71195e9a8b7ffdcadc17a393d38cc781ea407..b1de4f5f0678110a2b2b0c95d1276d1ab005e65b 100644 |
--- a/content/browser/compositor/gpu_process_transport_factory.cc |
+++ b/content/browser/compositor/gpu_process_transport_factory.cc |
@@ -31,6 +31,7 @@ |
#include "cc/surfaces/surface_manager.h" |
#include "components/display_compositor/compositor_overlay_candidate_validator.h" |
#include "components/display_compositor/gl_helper.h" |
+#include "components/display_compositor/host_shared_bitmap_manager.h" |
#include "content/browser/compositor/browser_compositor_output_surface.h" |
#include "content/browser/compositor/gpu_browser_compositor_output_surface.h" |
#include "content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h" |
@@ -40,7 +41,6 @@ |
#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" |
#include "content/browser/gpu/gpu_data_manager_impl.h" |
#include "content/browser/renderer_host/render_widget_host_impl.h" |
-#include "content/common/host_shared_bitmap_manager.h" |
#include "content/public/common/content_switches.h" |
#include "gpu/GLES2/gl2extchromium.h" |
#include "gpu/command_buffer/client/gles2_interface.h" |
@@ -581,11 +581,12 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
// The Display owns and uses the |display_output_surface| created above. |
data->display = base::MakeUnique<cc::Display>( |
- HostSharedBitmapManager::current(), GetGpuMemoryBufferManager(), |
- compositor->GetRendererSettings(), compositor->frame_sink_id(), |
- begin_frame_source, std::move(display_output_surface), |
- std::move(scheduler), base::MakeUnique<cc::TextureMailboxDeleter>( |
- compositor->task_runner().get())); |
+ display_compositor::HostSharedBitmapManager::current(), |
+ GetGpuMemoryBufferManager(), compositor->GetRendererSettings(), |
+ compositor->frame_sink_id(), begin_frame_source, |
+ std::move(display_output_surface), std::move(scheduler), |
+ base::MakeUnique<cc::TextureMailboxDeleter>( |
+ compositor->task_runner().get())); |
// Note that we are careful not to destroy prior BeginFrameSource objects |
// until we have reset |data->display|. |
data->synthetic_begin_frame_source = std::move(synthetic_begin_frame_source); |
@@ -605,7 +606,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
compositor->frame_sink_id(), surface_manager_.get(), |
data->display.get(), context_provider, |
shared_worker_context_provider_, GetGpuMemoryBufferManager(), |
- HostSharedBitmapManager::current()); |
+ display_compositor::HostSharedBitmapManager::current()); |
data->display->Resize(compositor->size()); |
data->display->SetOutputIsSecure(data->output_is_secure); |
compositor->SetCompositorFrameSink(std::move(compositor_frame_sink)); |