OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/offscreen_canvas_provider_impl.h" | 5 #include "content/browser/renderer_host/offscreen_canvas_provider_impl.h" |
6 | 6 |
7 #include "content/browser/compositor/surface_utils.h" | 7 #include "content/browser/compositor/surface_utils.h" |
8 #include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_m
anager.h" | 8 #include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_m
anager.h" |
9 #include "content/browser/renderer_host/offscreen_canvas_surface_impl.h" | 9 #include "content/browser/renderer_host/offscreen_canvas_surface_impl.h" |
10 | 10 |
11 namespace content { | 11 namespace content { |
12 | 12 |
13 OffscreenCanvasProviderImpl::OffscreenCanvasProviderImpl() = default; | 13 OffscreenCanvasProviderImpl::OffscreenCanvasProviderImpl( |
| 14 uint32_t renderer_client_id) |
| 15 : renderer_client_id_(renderer_client_id) {} |
14 | 16 |
15 OffscreenCanvasProviderImpl::~OffscreenCanvasProviderImpl() = default; | 17 OffscreenCanvasProviderImpl::~OffscreenCanvasProviderImpl() = default; |
16 | 18 |
17 void OffscreenCanvasProviderImpl::Add( | 19 void OffscreenCanvasProviderImpl::Add( |
18 blink::mojom::OffscreenCanvasProviderRequest request) { | 20 blink::mojom::OffscreenCanvasProviderRequest request) { |
19 bindings_.AddBinding(this, std::move(request)); | 21 bindings_.AddBinding(this, std::move(request)); |
20 } | 22 } |
21 | 23 |
22 void OffscreenCanvasProviderImpl::CreateOffscreenCanvasSurface( | 24 void OffscreenCanvasProviderImpl::CreateOffscreenCanvasSurface( |
23 const cc::FrameSinkId& parent_frame_sink_id, | 25 const cc::FrameSinkId& parent_frame_sink_id, |
24 const cc::FrameSinkId& frame_sink_id, | 26 const cc::FrameSinkId& frame_sink_id, |
25 cc::mojom::FrameSinkManagerClientPtr client, | 27 cc::mojom::FrameSinkManagerClientPtr client, |
26 blink::mojom::OffscreenCanvasSurfaceRequest request) { | 28 blink::mojom::OffscreenCanvasSurfaceRequest request) { |
| 29 // TODO(kylechar): Kill the renderer too. |
| 30 if (parent_frame_sink_id.client_id() != renderer_client_id_) { |
| 31 DLOG(ERROR) << "Invalid parent client id " << parent_frame_sink_id; |
| 32 return; |
| 33 } |
| 34 if (frame_sink_id.client_id() != renderer_client_id_) { |
| 35 DLOG(ERROR) << "Invalid client id " << frame_sink_id; |
| 36 return; |
| 37 } |
| 38 |
27 OffscreenCanvasSurfaceImpl::Create(parent_frame_sink_id, frame_sink_id, | 39 OffscreenCanvasSurfaceImpl::Create(parent_frame_sink_id, frame_sink_id, |
28 std::move(client), std::move(request)); | 40 std::move(client), std::move(request)); |
29 } | 41 } |
30 | 42 |
31 void OffscreenCanvasProviderImpl::CreateCompositorFrameSink( | 43 void OffscreenCanvasProviderImpl::CreateCompositorFrameSink( |
32 const cc::FrameSinkId& frame_sink_id, | 44 const cc::FrameSinkId& frame_sink_id, |
33 cc::mojom::MojoCompositorFrameSinkClientPtr client, | 45 cc::mojom::MojoCompositorFrameSinkClientPtr client, |
34 cc::mojom::MojoCompositorFrameSinkRequest request) { | 46 cc::mojom::MojoCompositorFrameSinkRequest request) { |
| 47 // TODO(kylechar): Kill the renderer too. |
| 48 if (frame_sink_id.client_id() != renderer_client_id_) { |
| 49 DLOG(ERROR) << "Invalid client id " << frame_sink_id; |
| 50 return; |
| 51 } |
| 52 |
35 // TODO(kylechar): Add test for bad |frame_sink_id|. | 53 // TODO(kylechar): Add test for bad |frame_sink_id|. |
36 auto* manager = OffscreenCanvasCompositorFrameSinkManager::GetInstance(); | 54 auto* manager = OffscreenCanvasCompositorFrameSinkManager::GetInstance(); |
37 auto* surface_impl = manager->GetSurfaceInstance(frame_sink_id); | 55 auto* surface_impl = manager->GetSurfaceInstance(frame_sink_id); |
38 if (!surface_impl) { | 56 if (!surface_impl) { |
39 DLOG(ERROR) << "No OffscreenCanvasSurfaceImpl for " << frame_sink_id; | 57 DLOG(ERROR) << "No OffscreenCanvasSurfaceImpl for " << frame_sink_id; |
40 return; | 58 return; |
41 } | 59 } |
42 | 60 |
43 surface_impl->CreateCompositorFrameSink(std::move(client), | 61 surface_impl->CreateCompositorFrameSink(std::move(client), |
44 std::move(request)); | 62 std::move(request)); |
45 } | 63 } |
46 | 64 |
47 } // namespace content | 65 } // namespace content |
OLD | NEW |