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

Unified Diff: cc/test/test_delegating_output_surface.cc

Issue 2166423002: ui::ContextFactory should not create SurfaceIdAllocators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed for android Created 4 years, 5 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 | « cc/surfaces/surface_id_allocator.cc ('k') | components/exo/surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/test_delegating_output_surface.cc
diff --git a/cc/test/test_delegating_output_surface.cc b/cc/test/test_delegating_output_surface.cc
index 15fca6c14cf857cfc899f5435236b786cec5a60b..dbbf59207c4f2a6669edcd817dc4ec271f9ed2f6 100644
--- a/cc/test/test_delegating_output_surface.cc
+++ b/cc/test/test_delegating_output_surface.cc
@@ -56,10 +56,14 @@ TestDelegatingOutputSurface::TestDelegatingOutputSurface(
capabilities_.delegated_sync_points_required =
!context_shared_with_compositor;
- surface_id_allocator_->RegisterSurfaceClientId(surface_manager_.get());
+ surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
}
-TestDelegatingOutputSurface::~TestDelegatingOutputSurface() {}
+TestDelegatingOutputSurface::~TestDelegatingOutputSurface() {
+ if (surface_manager_)
piman 2016/07/21 21:02:22 nit: {}
Fady Samuel 2016/07/21 21:21:03 actually TestDelegatingOuptutSurface owns SurfaceM
+ surface_manager_->InvalidateSurfaceClientId(
+ surface_id_allocator_->client_id());
+}
bool TestDelegatingOutputSurface::BindToClient(OutputSurfaceClient* client) {
if (!OutputSurface::BindToClient(client))
« no previous file with comments | « cc/surfaces/surface_id_allocator.cc ('k') | components/exo/surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698