| Index: cc/surfaces/surface_aggregator_unittest.cc
|
| diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc
|
| index c726c8070e49f4838d38aff4a4b83816db56e328..c12aa30d460051b14c5d6fca1f9b664f98a9f2d1 100644
|
| --- a/cc/surfaces/surface_aggregator_unittest.cc
|
| +++ b/cc/surfaces/surface_aggregator_unittest.cc
|
| @@ -118,7 +118,7 @@ class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest {
|
| scoped_ptr<CompositorFrame> frame(new CompositorFrame);
|
| frame->delegated_frame_data = frame_data.Pass();
|
|
|
| - factory_.SubmitFrame(surface_id, frame.Pass());
|
| + factory_.SubmitFrame(surface_id, frame.Pass(), base::Closure());
|
| }
|
|
|
| void QueuePassAsFrame(scoped_ptr<RenderPass> pass, SurfaceId surface_id) {
|
| @@ -128,7 +128,7 @@ class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest {
|
| scoped_ptr<CompositorFrame> child_frame(new CompositorFrame);
|
| child_frame->delegated_frame_data = delegated_frame_data.Pass();
|
|
|
| - factory_.SubmitFrame(surface_id, child_frame.Pass());
|
| + factory_.SubmitFrame(surface_id, child_frame.Pass(), base::Closure());
|
| }
|
|
|
| protected:
|
| @@ -701,7 +701,7 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateMultiplePassWithTransform) {
|
| scoped_ptr<CompositorFrame> child_frame(new CompositorFrame);
|
| child_frame->delegated_frame_data = child_frame_data.Pass();
|
|
|
| - factory_.SubmitFrame(child_surface_id, child_frame.Pass());
|
| + factory_.SubmitFrame(child_surface_id, child_frame.Pass(), base::Closure());
|
|
|
| test::Quad root_quads[] = {test::Quad::SolidColorQuad(1),
|
| test::Quad::SurfaceQuad(child_surface_id)};
|
| @@ -726,7 +726,7 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateMultiplePassWithTransform) {
|
| scoped_ptr<CompositorFrame> root_frame(new CompositorFrame);
|
| root_frame->delegated_frame_data = root_frame_data.Pass();
|
|
|
| - factory_.SubmitFrame(root_surface_id_, root_frame.Pass());
|
| + factory_.SubmitFrame(root_surface_id_, root_frame.Pass(), base::Closure());
|
|
|
| std::set<SurfaceId> surface_set;
|
| scoped_ptr<CompositorFrame> aggregated_frame =
|
| @@ -888,7 +888,7 @@ void SubmitFrameWithResources(ResourceProvider::ResourceId* resource_ids,
|
| frame_data->render_pass_list.push_back(pass.Pass());
|
| scoped_ptr<CompositorFrame> frame(new CompositorFrame);
|
| frame->delegated_frame_data = frame_data.Pass();
|
| - factory->SubmitFrame(surface_id, frame.Pass());
|
| + factory->SubmitFrame(surface_id, frame.Pass(), base::Closure());
|
| }
|
|
|
| TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) {
|
|
|