Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Unified Diff: cc/test/test_compositor_frame_sink.cc

Issue 2349743004: cc: Remove things from OutputSurface and CompositorFrameSink. (Closed)
Patch Set: delete-stuff-cfs: . Created 4 years, 3 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
Index: cc/test/test_compositor_frame_sink.cc
diff --git a/cc/test/test_compositor_frame_sink.cc b/cc/test/test_compositor_frame_sink.cc
index 1cf7ced2322072e66a60f5e3be4f404d41c4c76a..a548922d42a5347fa811ab0a04f570f7a8752bac 100644
--- a/cc/test/test_compositor_frame_sink.cc
+++ b/cc/test/test_compositor_frame_sink.cc
@@ -29,8 +29,7 @@ TestCompositorFrameSink::TestCompositorFrameSink(
bool synchronous_composite,
bool force_disable_reclaim_resources)
: CompositorFrameSink(std::move(compositor_context_provider),
- std::move(worker_context_provider),
- nullptr),
+ std::move(worker_context_provider)),
surface_manager_(new SurfaceManager),
surface_id_allocator_(new SurfaceIdAllocator(kCompositorClientId)),
surface_factory_(new SurfaceFactory(surface_manager_.get(), this)),
@@ -60,7 +59,6 @@ TestCompositorFrameSink::TestCompositorFrameSink(
std::move(display_output_surface), std::move(scheduler),
base::MakeUnique<TextureMailboxDeleter>(task_runner)));
- capabilities_.delegated_rendering = true;
// Since this CompositorFrameSink and the Display are tightly coupled and in
// the same process/thread, the LayerTreeHostImpl can reclaim resources from
// the Display. But we allow tests to disable this to mimic an out-of-process
@@ -68,6 +66,8 @@ TestCompositorFrameSink::TestCompositorFrameSink(
capabilities_.can_force_reclaim_resources = !force_disable_reclaim_resources;
capabilities_.delegated_sync_points_required =
!context_shared_with_compositor;
+ // TODO(enne): Remove this, it's only here to make some tests pass.
+ capabilities_.adjust_deadline_for_parent = true;
}
TestCompositorFrameSink::~TestCompositorFrameSink() {
@@ -174,17 +174,6 @@ void TestCompositorFrameSink::ForceReclaimResources() {
}
}
-void TestCompositorFrameSink::BindFramebuffer() {
- // This is a delegating output surface, no framebuffer/direct drawing support.
- NOTREACHED();
-}
-
-uint32_t TestCompositorFrameSink::GetFramebufferCopyTextureFormat() {
- // This is a delegating output surface, no framebuffer/direct drawing support.
- NOTREACHED();
- return 0;
-}
-
void TestCompositorFrameSink::ReturnResources(
const ReturnedResourceArray& resources) {
client_->ReclaimResources(resources);

Powered by Google App Engine
This is Rietveld 408576698