mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Move CompositorFrameSink and FrameSinkManager mojom from cc to viz

Browse source
This commit is contained in:
Aleksei Kuzmin 2017-12-05 00:35:12 +03:00 • committed by Cheng Zhao
parent abc6003640
commit 1a9b056e93
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/osr/osr_render_widget_host_view.cc
View file

@ -530,7 +530,7 @@ void OffScreenRenderWidgetHostView::UnlockMouse() {
} }
void OffScreenRenderWidgetHostView::DidCreateNewRendererCompositorFrameSink( void OffScreenRenderWidgetHostView::DidCreateNewRendererCompositorFrameSink(
cc::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) { viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) {
renderer_compositor_frame_sink_ = renderer_compositor_frame_sink; renderer_compositor_frame_sink_ = renderer_compositor_frame_sink;
if (GetDelegatedFrameHost()) { if (GetDelegatedFrameHost()) {
GetDelegatedFrameHost()->DidCreateNewRendererCompositorFrameSink( GetDelegatedFrameHost()->DidCreateNewRendererCompositorFrameSink(

4
atom/browser/osr/osr_render_widget_host_view.h
View file

@ -118,7 +118,7 @@ class OffScreenRenderWidgetHostView
// content::RenderWidgetHostViewBase: // content::RenderWidgetHostViewBase:
void DidCreateNewRendererCompositorFrameSink( void DidCreateNewRendererCompositorFrameSink(
cc::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink)
override; override;
void SubmitCompositorFrame(const viz::LocalSurfaceId& local_surface_id, void SubmitCompositorFrame(const viz::LocalSurfaceId& local_surface_id,
cc::CompositorFrame frame) override; cc::CompositorFrame frame) override;
@ -342,7 +342,7 @@ class OffScreenRenderWidgetHostView
std::string selected_text_; std::string selected_text_;
#endif #endif
cc::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_; viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_;
SkColor background_color_; SkColor background_color_;