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

Index: content/browser/compositor/offscreen_browser_compositor_output_surface.cc

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

index 3f1623524b109cb00c642bf1f7551d1ddce168cd..c4aa08c5752f88020bac16398f61602ae5e5fd10 100644

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

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

@@ -11,7 +11,7 @@

#include "cc/output/output_surface_client.h"

#include "cc/output/output_surface_frame.h"

#include "cc/resources/resource_provider.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"

@@ -32,7 +32,7 @@ OffscreenBrowserCompositorOutputSurface::

OffscreenBrowserCompositorOutputSurface(

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,