| Index: cc/surfaces/surface_hittest_unittest.cc
|
| diff --git a/cc/surfaces/surface_hittest_unittest.cc b/cc/surfaces/surface_hittest_unittest.cc
|
| index fde62f3c2b4eb39e155653c4b8f3c0d1f044fcc1..2b59f0a7391b9bc4bbc19936b481bb32be3d9675 100644
|
| --- a/cc/surfaces/surface_hittest_unittest.cc
|
| +++ b/cc/surfaces/surface_hittest_unittest.cc
|
| @@ -79,7 +79,7 @@ TEST(SurfaceHittestTest, Hittest_BadCompositorFrameDoesNotCrash) {
|
| SurfaceIdAllocator root_allocator(2);
|
| SurfaceId root_surface_id = root_allocator.GenerateId();
|
| factory.Create(root_surface_id);
|
| - factory.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
|
| + factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
|
| SurfaceFactory::DrawCallback());
|
|
|
| {
|
| @@ -109,7 +109,7 @@ TEST(SurfaceHittestTest, Hittest_SingleSurface) {
|
| SurfaceIdAllocator root_allocator(2);
|
| SurfaceId root_surface_id = root_allocator.GenerateId();
|
| factory.Create(root_surface_id);
|
| - factory.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
|
| + factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
|
| SurfaceFactory::DrawCallback());
|
| TestCase tests[] = {
|
| {
|
| @@ -153,7 +153,7 @@ TEST(SurfaceHittestTest, Hittest_ChildSurface) {
|
| SurfaceIdAllocator root_allocator(2);
|
| SurfaceId root_surface_id = root_allocator.GenerateId();
|
| factory.Create(root_surface_id);
|
| - factory.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
|
| + factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
|
| SurfaceFactory::DrawCallback());
|
|
|
| // Creates a child surface.
|
| @@ -173,7 +173,7 @@ TEST(SurfaceHittestTest, Hittest_ChildSurface) {
|
|
|
| // Submit the frame.
|
| factory.Create(child_surface_id);
|
| - factory.SubmitCompositorFrame(child_surface_id, child_frame.Pass(),
|
| + factory.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
|
| SurfaceFactory::DrawCallback());
|
|
|
| TestCase tests[] = {
|
| @@ -227,7 +227,7 @@ TEST(SurfaceHittestTest, Hittest_ChildSurface) {
|
| root_rect,
|
| child_rect,
|
| child_surface_id);
|
| - factory.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
|
| + factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
|
| SurfaceFactory::DrawCallback());
|
|
|
| // Verify that point (100, 100) no longer falls on the child surface.
|
| @@ -293,7 +293,7 @@ TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
|
| SurfaceIdAllocator root_allocator(2);
|
| SurfaceId root_surface_id = root_allocator.GenerateId();
|
| factory.Create(root_surface_id);
|
| - factory.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
|
| + factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
|
| SurfaceFactory::DrawCallback());
|
|
|
| // Creates a child surface.
|
| @@ -313,7 +313,7 @@ TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
|
|
|
| // Submit the frame.
|
| factory.Create(child_surface_id);
|
| - factory.SubmitCompositorFrame(child_surface_id, child_frame.Pass(),
|
| + factory.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
|
| SurfaceFactory::DrawCallback());
|
|
|
| TestCase tests[] = {
|
| @@ -412,7 +412,7 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
|
| SurfaceIdAllocator root_allocator(1);
|
| SurfaceId root_surface_id = root_allocator.GenerateId();
|
| factory.Create(root_surface_id);
|
| - factory.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
|
| + factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
|
| SurfaceFactory::DrawCallback());
|
|
|
| TestCase tests[] = {
|
|
|