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

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, 2 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
« no previous file with comments | « cc/surfaces/surface_factory.cc ('k') | cc/surfaces/surface_id_allocator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); 365 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
366 TransferableResource resource; 366 TransferableResource resource;
367 resource.id = 1; 367 resource.id = 1;
368 resource.mailbox_holder.texture_target = GL_TEXTURE_2D; 368 resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
369 frame_data->resource_list.push_back(resource); 369 frame_data->resource_list.push_back(resource);
370 scoped_ptr<CompositorFrame> frame(new CompositorFrame); 370 scoped_ptr<CompositorFrame> frame(new CompositorFrame);
371 frame->delegated_frame_data = frame_data.Pass(); 371 frame->delegated_frame_data = frame_data.Pass();
372 factory_.SubmitFrame(id, frame.Pass(), base::Closure()); 372 factory_.SubmitFrame(id, frame.Pass(), base::Closure());
373 } 373 }
374 374
375 TEST_F(SurfaceFactoryTest, DestroySequence) {
376 SurfaceId id2(5);
377 factory_.Create(id2, gfx::Size(5, 5));
378
379 // Check that waiting before the sequence is satisfied works.
380 std::set<SurfaceSequence> sequence;
381 sequence.insert(SurfaceSequence(0, 4));
382 factory_.DestroyOnSequence(id2, sequence);
383
384 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
385 scoped_ptr<CompositorFrame> frame(new CompositorFrame);
386 frame->metadata.satisfies_sequences.push_back(6);
387 frame->metadata.satisfies_sequences.push_back(4);
388 frame->delegated_frame_data = frame_data.Pass();
389 DCHECK(manager_.GetSurfaceForId(id2));
390 factory_.SubmitFrame(surface_id_, frame.Pass(), base::Closure());
391 DCHECK(!manager_.GetSurfaceForId(id2));
392
393 // Check that waiting after the sequence is satisfied works.
394 factory_.Create(id2, gfx::Size(5, 5));
395 sequence.clear();
396 sequence.insert(SurfaceSequence(0, 6));
397 DCHECK(manager_.GetSurfaceForId(id2));
398 factory_.DestroyOnSequence(id2, sequence);
399 DCHECK(!manager_.GetSurfaceForId(id2));
400 }
401
375 } // namespace 402 } // namespace
376 } // namespace cc 403 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/surface_factory.cc ('k') | cc/surfaces/surface_id_allocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698