| 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 aded09917040e0b53df5f2cef3c44d6408b25c58..e4f4a8937af6f854225140e119a571b94f2d69b4 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.cc
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
| @@ -152,6 +152,7 @@ struct GpuProcessTransportFactory::PerCompositorData {
|
| BrowserCompositorOutputSurface* surface;
|
| ReflectorImpl* reflector;
|
| std::unique_ptr<cc::OnscreenDisplayClient> display_client;
|
| + bool output_is_secure = false;
|
|
|
| PerCompositorData()
|
| : surface_handle(gpu::kNullSurfaceHandle),
|
| @@ -512,6 +513,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
|
| display_client->set_surface_output_surface(output_surface.get());
|
| output_surface->set_display_client(display_client.get());
|
| display_client->display()->Resize(compositor->size());
|
| + display_client->display()->SetOutputIsSecure(data->output_is_secure);
|
| data->display_client = std::move(display_client);
|
| compositor->SetOutputSurface(std::move(output_surface));
|
| }
|
| @@ -634,6 +636,18 @@ void GpuProcessTransportFactory::SetAuthoritativeVSyncInterval(
|
| }
|
| }
|
|
|
| +void GpuProcessTransportFactory::SetOutputIsSecure(ui::Compositor* compositor,
|
| + bool secure) {
|
| + PerCompositorDataMap::iterator it = per_compositor_data_.find(compositor);
|
| + if (it == per_compositor_data_.end())
|
| + return;
|
| + PerCompositorData* data = it->second;
|
| + DCHECK(data);
|
| + data->output_is_secure = secure;
|
| + if (data->display_client)
|
| + data->display_client->display()->SetOutputIsSecure(secure);
|
| +}
|
| +
|
| cc::SurfaceManager* GpuProcessTransportFactory::GetSurfaceManager() {
|
| return surface_manager_.get();
|
| }
|
|
|