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

Unified Diff: cc/test/test_compositor_frame_sink.cc

Issue 2485473003: Remove SurfaceFactory::Create and SurfaceFactory::Destroy (Closed)
Patch Set: SetPreviousFrame lint Created 4 years, 1 month 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 b9d4a78da9794ad02dd07d0dfdbb907075d04325..8f129e1536e77f7a5df37c3cf5a036e41b21f1e7 100644
--- a/cc/test/test_compositor_frame_sink.cc
+++ b/cc/test/test_compositor_frame_sink.cc
@@ -111,8 +111,7 @@ bool TestCompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
void TestCompositorFrameSink::DetachFromClient() {
// Some tests make BindToClient fail on purpose. ^__^
if (bound_) {
- if (delegated_local_frame_id_.is_valid())
- surface_factory_->Destroy(delegated_local_frame_id_);
+ surface_factory_->Reset();
Fady Samuel 2016/11/11 19:47:57 EvictFrame()
surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
display_ = nullptr;
@@ -130,7 +129,6 @@ void TestCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
if (!delegated_local_frame_id_.is_valid()) {
delegated_local_frame_id_ = surface_id_allocator_->GenerateId();
- surface_factory_->Create(delegated_local_frame_id_);
}
display_->SetLocalFrameId(delegated_local_frame_id_,
frame.metadata.device_scale_factor);

Powered by Google App Engine
This is Rietveld 408576698