content/browser/compositor/gpu_browser_compositor_output_surface.cc - 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_browser_compositor_output_surface.cc

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/compositor/gpu_browser_compositor_output_surface.h ('k') | content/browser/compositor/gpu_output_surface_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/gpu_browser_compositor_output_surface.cc

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

index 959460452af8f9e6c6bd44f07d9b7446b5547d44..69ef43af29d0f62f32600005e5a0cf4d7f844659 100644

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

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

@@ -9,7 +9,7 @@

#include "build/build_config.h"

#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 "content/browser/compositor/reflector_impl.h"

#include "content/browser/compositor/reflector_texture.h"

#include "content/browser/renderer_host/render_widget_host_impl.h"

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

GpuBrowserCompositorOutputSurface::GpuBrowserCompositorOutputSurface(

scoped_refptr<ui::ContextProviderCommandBuffer> context,

const UpdateVSyncParametersCallback& update_vsync_parameters_callback,

- std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>

+ std::unique_ptr<viz::CompositorOverlayCandidateValidator>

overlay_candidate_validator)

: BrowserCompositorOutputSurface(std::move(context),

update_vsync_parameters_callback,