From 1a9b056e934aa97786329d96a1b75caae787ad2b Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Tue, 5 Dec 2017 00:35:12 +0300 Subject: [PATCH] Move CompositorFrameSink and FrameSinkManager mojom from cc to viz --- atom/browser/osr/osr_render_widget_host_view.cc | 2 +- atom/browser/osr/osr_render_widget_host_view.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc index 80694d099820..21e47f02bbb4 100644 --- a/atom/browser/osr/osr_render_widget_host_view.cc +++ b/atom/browser/osr/osr_render_widget_host_view.cc @@ -530,7 +530,7 @@ void OffScreenRenderWidgetHostView::UnlockMouse() { } 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; if (GetDelegatedFrameHost()) { GetDelegatedFrameHost()->DidCreateNewRendererCompositorFrameSink( diff --git a/atom/browser/osr/osr_render_widget_host_view.h b/atom/browser/osr/osr_render_widget_host_view.h index 4bf08df28002..2e6c9ef1be30 100644 --- a/atom/browser/osr/osr_render_widget_host_view.h +++ b/atom/browser/osr/osr_render_widget_host_view.h @@ -118,7 +118,7 @@ class OffScreenRenderWidgetHostView // content::RenderWidgetHostViewBase: void DidCreateNewRendererCompositorFrameSink( - cc::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) + viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) override; void SubmitCompositorFrame(const viz::LocalSurfaceId& local_surface_id, cc::CompositorFrame frame) override; @@ -342,7 +342,7 @@ class OffScreenRenderWidgetHostView std::string selected_text_; #endif - cc::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_; + viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_; SkColor background_color_;