content/browser/compositor/reflector_impl_unittest.cc - Issue 1931213002: display_compositor: Move CompositorOverlayCandidateValidator from content.

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/reflector_impl_unittest.cc

Issue 1931213002: display_compositor: Move CompositorOverlayCandidateValidator from content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DONE_2016.04.28_dc-overlay-candidate-validator

Patch Set: . Created 4 years, 8 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.cc ('k') | content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/reflector_impl_unittest.cc

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

index d5a512c61a9380ca77a01129786c810f46a6045d..03b50067f35c01d9be10ce535d1b91770f7fa536 100644

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

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

@@ -8,8 +8,8 @@

#include "cc/test/fake_output_surface_client.h"

#include "cc/test/test_context_provider.h"

#include "cc/test/test_web_graphics_context_3d.h"

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

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

-#include "content/browser/compositor/browser_compositor_overlay_candidate_validator.h"

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

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

#include "content/browser/compositor/test/no_transport_image_transport_factory.h"

@@ -19,7 +19,7 @@

#include "ui/compositor/test/context_factories_for_test.h"

#if defined(USE_OZONE)

-#include "content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.h"

+#include "components/display_compositor/compositor_overlay_candidate_validator_ozone.h"

#include "ui/ozone/public/overlay_candidates_ozone.h"

#endif // defined(USE_OZONE)

@@ -57,11 +57,12 @@ class TestOverlayCandidatesOzone : public ui::OverlayCandidatesOzone {

};

#endif // defined(USE_OZONE)

-std::unique_ptr<BrowserCompositorOverlayCandidateValidator>

+std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>

CreateTestValidatorOzone() {

#if defined(USE_OZONE)

- return std::unique_ptr<BrowserCompositorOverlayCandidateValidator>(

- new BrowserCompositorOverlayCandidateValidatorOzone(

+ return std::unique_ptr<

+ display_compositor::CompositorOverlayCandidateValidator>(

+ new display_compositor::CompositorOverlayCandidateValidatorOzone(

std::unique_ptr<ui::OverlayCandidatesOzone>(

new TestOverlayCandidatesOzone())));

#else