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

Side by Side Diff: cc/surfaces/surface_factory_unittest.cc

Issue 553213003: Avoid destroying surface before the parent surface stops referencing it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/output/compositor_frame.h" 5 #include "cc/output/compositor_frame.h"
6 #include "cc/output/delegated_frame_data.h" 6 #include "cc/output/delegated_frame_data.h"
7 #include "cc/surfaces/surface.h" 7 #include "cc/surfaces/surface.h"
8 #include "cc/surfaces/surface_factory.h" 8 #include "cc/surfaces/surface_factory.h"
9 #include "cc/surfaces/surface_factory_client.h" 9 #include "cc/surfaces/surface_factory_client.h"
10 #include "cc/surfaces/surface_manager.h" 10 #include "cc/surfaces/surface_manager.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 { 349 {
350 SCOPED_TRACE("fourth frame, second unref"); 350 SCOPED_TRACE("fourth frame, second unref");
351 ResourceProvider::ResourceId expected_returned_ids[] = {12, 13}; 351 ResourceProvider::ResourceId expected_returned_ids[] = {12, 13};
352 int expected_returned_counts[] = {2, 2}; 352 int expected_returned_counts[] = {2, 2};
353 CheckReturnedResourcesMatchExpected(expected_returned_ids, 353 CheckReturnedResourcesMatchExpected(expected_returned_ids,
354 expected_returned_counts, 354 expected_returned_counts,
355 arraysize(expected_returned_counts)); 355 arraysize(expected_returned_counts));
356 } 356 }
357 } 357 }
358 358
359 TEST_F(SurfaceFactoryTest, DestroySequence) {
360 SurfaceId id2(5);
361 factory_.Create(id2, gfx::Size(5, 5));
362
363 // Check that waiting before the sequence is satisfied works.
364 std::set<SurfaceSequence> sequence;
365 sequence.insert(SurfaceSequence(0, 4));
366 factory_.DestroyOnSequence(id2, sequence);
367
368 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
369 scoped_ptr<CompositorFrame> frame(new CompositorFrame);
370 frame->metadata.satisfies_sequence.push_back(6);
371 frame->metadata.satisfies_sequence.push_back(4);
372 frame->delegated_frame_data = frame_data.Pass();
373 DCHECK(manager_.GetSurfaceForId(id2));
374 factory_.SubmitFrame(surface_id_, frame.Pass(), base::Closure());
375 DCHECK(!manager_.GetSurfaceForId(id2));
376
377 // Check that waiting after the sequence is satisfied works.
378 factory_.Create(id2, gfx::Size(5, 5));
379 sequence.clear();
380 sequence.insert(SurfaceSequence(0, 6));
381 DCHECK(manager_.GetSurfaceForId(id2));
382 factory_.DestroyOnSequence(id2, sequence);
383 DCHECK(!manager_.GetSurfaceForId(id2));
384 }
385
359 } // namespace 386 } // namespace
360 } // namespace cc 387 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698