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 instead of crashing chrome. | |
30 CHECK_EQ(parent_frame_sink_id.client_id(), renderer_client_id_); | |
31 CHECK_EQ(frame_sink_id.client_id(), renderer_client_id_); | |
piman
2017/04/12 22:53:37
Can we just return early / do nothing (and DLOG et
kylechar
2017/04/13 17:09:18
Done.
| |
32 | |
27 OffscreenCanvasSurfaceImpl::Create(parent_frame_sink_id, frame_sink_id, | 33 OffscreenCanvasSurfaceImpl::Create(parent_frame_sink_id, frame_sink_id, |
28 std::move(client), std::move(request)); | 34 std::move(client), std::move(request)); |
29 } | 35 } |
30 | 36 |
31 void OffscreenCanvasProviderImpl::CreateCompositorFrameSink( | 37 void OffscreenCanvasProviderImpl::CreateCompositorFrameSink( |
32 const cc::FrameSinkId& frame_sink_id, | 38 const cc::FrameSinkId& frame_sink_id, |
33 cc::mojom::MojoCompositorFrameSinkClientPtr client, | 39 cc::mojom::MojoCompositorFrameSinkClientPtr client, |
34 cc::mojom::MojoCompositorFrameSinkRequest request) { | 40 cc::mojom::MojoCompositorFrameSinkRequest request) { |
41 // TODO(kylechar): Kill the renderer instead of crashing chrome. | |
42 CHECK_EQ(frame_sink_id.client_id(), renderer_client_id_); | |
piman
2017/04/12 22:53:37
ditto.
kylechar
2017/04/13 17:09:18
Done.
| |
43 | |
35 // TODO(kylechar): Add test for bad |frame_sink_id|. | 44 // TODO(kylechar): Add test for bad |frame_sink_id|. |
36 auto* manager = OffscreenCanvasCompositorFrameSinkManager::GetInstance(); | 45 auto* manager = OffscreenCanvasCompositorFrameSinkManager::GetInstance(); |
37 auto* surface_impl = manager->GetSurfaceInstance(frame_sink_id); | 46 auto* surface_impl = manager->GetSurfaceInstance(frame_sink_id); |
38 if (!surface_impl) { | 47 if (!surface_impl) { |
39 DLOG(ERROR) << "No OffscreenCanvasSurfaceImpl for " << frame_sink_id; | 48 DLOG(ERROR) << "No OffscreenCanvasSurfaceImpl for " << frame_sink_id; |
40 return; | 49 return; |
41 } | 50 } |
42 | 51 |
43 surface_impl->CreateCompositorFrameSink(std::move(client), | 52 surface_impl->CreateCompositorFrameSink(std::move(client), |
44 std::move(request)); | 53 std::move(request)); |
45 } | 54 } |
46 | 55 |
47 } // namespace content | 56 } // namespace content |
OLD | NEW |