Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3175)

Unified Diff: content/renderer/mus/render_widget_mus_connection.cc

Issue 2586323002: mus: Use ui::ContextProviderCommandBuffer. (Closed)
Patch Set: . Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/mus/render_widget_mus_connection.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/mus/render_widget_mus_connection.cc
diff --git a/content/renderer/mus/render_widget_mus_connection.cc b/content/renderer/mus/render_widget_mus_connection.cc
index 80464706d3b82ad7093297a084daaef91f33f56f..15f72077a25c8759c85de5f695d9c4a2d50a1f2c 100644
--- a/content/renderer/mus/render_widget_mus_connection.cc
+++ b/content/renderer/mus/render_widget_mus_connection.cc
@@ -11,7 +11,6 @@
#include "content/renderer/mus/compositor_mus_connection.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/render_view_impl.h"
-#include "services/ui/public/cpp/context_provider.h"
#include "services/ui/public/cpp/window_compositor_frame_sink.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
@@ -40,16 +39,15 @@ void RenderWidgetMusConnection::Bind(
std::unique_ptr<cc::CompositorFrameSink>
RenderWidgetMusConnection::CreateCompositorFrameSink(
- scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
+ scoped_refptr<cc::ContextProvider> context_provider,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!window_compositor_frame_sink_binding_);
std::unique_ptr<cc::CompositorFrameSink> compositor_frame_sink(
ui::WindowCompositorFrameSink::Create(
- make_scoped_refptr(
- new ui::ContextProvider(std::move(gpu_channel_host))),
- gpu_memory_buffer_manager, &window_compositor_frame_sink_binding_));
+ std::move(context_provider), gpu_memory_buffer_manager,
+ &window_compositor_frame_sink_binding_));
if (compositor_mus_connection_) {
compositor_mus_connection_->AttachCompositorFrameSinkOnMainThread(
std::move(window_compositor_frame_sink_binding_));
« no previous file with comments | « content/renderer/mus/render_widget_mus_connection.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698