content/browser/compositor/mus_browser_compositor_output_surface.cc - Issue 2584363002: gpu: Move ContextProviderCommandBuffer into mus gpu client-lib.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/compositor/mus_browser_compositor_output_surface.cc

Issue 2584363002: gpu: Move ContextProviderCommandBuffer into mus gpu client-lib. (Closed)

Patch Set: tot merge 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/browser/compositor/mus_browser_compositor_output_surface.h ('k') | content/browser/compositor/offscreen_browser_compositor_output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/mus_browser_compositor_output_surface.cc

diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.cc b/content/browser/compositor/mus_browser_compositor_output_surface.cc

index a107595de4d60a564a8a943846e9808aa9b632c7..d825ca97e8c0df47284b08b7a4026cd7c5c2e613 100644

--- a/content/browser/compositor/mus_browser_compositor_output_surface.cc

+++ b/content/browser/compositor/mus_browser_compositor_output_surface.cc

@@ -11,9 +11,9 @@

#include "cc/quads/render_pass.h"

#include "cc/quads/texture_draw_quad.h"

#include "components/display_compositor/compositor_overlay_candidate_validator.h"

-#include "content/common/gpu/client/context_provider_command_buffer.h"

#include "gpu/command_buffer/client/gles2_interface.h"

#include "gpu/ipc/client/command_buffer_proxy_impl.h"

+#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"

#include "services/ui/public/cpp/window.h"

#include "services/ui/public/cpp/window_compositor_frame_sink.h"

#include "ui/aura/mus/window_compositor_frame_sink.h"

@@ -25,7 +25,7 @@ namespace content {

MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(

ui::Window* window,

- scoped_refptr<ContextProviderCommandBuffer> context,

+ scoped_refptr<ui::ContextProviderCommandBuffer> context,

gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,

const UpdateVSyncParametersCallback& update_vsync_parameters_callback,

std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>

@@ -44,7 +44,7 @@ MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(