content/browser/compositor/gpu_output_surface_mac.mm - Issue 2873243002: Move components/display_compositor to components/viz/display_compositor

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/gpu_output_surface_mac.mm

Issue 2873243002: Move components/display_compositor to components/viz/display_compositor (Closed)

Patch Set: Rebase Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/compositor/gpu_output_surface_mac.mm

diff --git a/content/browser/compositor/gpu_output_surface_mac.mm b/content/browser/compositor/gpu_output_surface_mac.mm

index 3a50527451dad04a35710417479f755ee7d75c07..45ee5a4253c0f4bbefc0e062ef8378181997c25a 100644

--- a/content/browser/compositor/gpu_output_surface_mac.mm

+++ b/content/browser/compositor/gpu_output_surface_mac.mm

@@ -6,7 +6,7 @@

#include "cc/output/output_surface_client.h"

#include "cc/output/output_surface_frame.h"

-#include "components/display_compositor/compositor_overlay_candidate_validator.h"

+#include "components/viz/display_compositor/compositor_overlay_candidate_validator.h"

#include "gpu/GLES2/gl2extchromium.h"

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

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

@@ -53,7 +53,7 @@ GpuOutputSurfaceMac::GpuOutputSurfaceMac(

scoped_refptr<ui::ContextProviderCommandBuffer> context,

gpu::SurfaceHandle surface_handle,

const UpdateVSyncParametersCallback& update_vsync_parameters_callback,

- std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>

+ std::unique_ptr<viz::CompositorOverlayCandidateValidator>

overlay_candidate_validator,

gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager)

: GpuSurfacelessBrowserCompositorOutputSurface(