OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/test/layer_tree_pixel_test.h" | 5 #include "cc/test/layer_tree_pixel_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "cc/base/switches.h" | 9 #include "cc/base/switches.h" |
10 #include "cc/layers/solid_color_layer.h" | 10 #include "cc/layers/solid_color_layer.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 new PixelTestSoftwareOutputDevice); | 45 new PixelTestSoftwareOutputDevice); |
46 software_output_device->set_surface_expansion_size( | 46 software_output_device->set_surface_expansion_size( |
47 surface_expansion_size); | 47 surface_expansion_size); |
48 output_surface = make_scoped_ptr( | 48 output_surface = make_scoped_ptr( |
49 new PixelTestOutputSurface(software_output_device.Pass())); | 49 new PixelTestOutputSurface(software_output_device.Pass())); |
50 break; | 50 break; |
51 } | 51 } |
52 case PIXEL_TEST_GL: { | 52 case PIXEL_TEST_GL: { |
53 bool flipped_output_surface = false; | 53 bool flipped_output_surface = false; |
54 output_surface = make_scoped_ptr(new PixelTestOutputSurface( | 54 output_surface = make_scoped_ptr(new PixelTestOutputSurface( |
55 new TestInProcessContextProvider, flipped_output_surface)); | 55 new TestInProcessContextProvider, nullptr, flipped_output_surface)); |
56 break; | 56 break; |
57 } | 57 } |
58 } | 58 } |
59 | 59 |
60 output_surface->set_surface_expansion_size(surface_expansion_size); | 60 output_surface->set_surface_expansion_size(surface_expansion_size); |
61 return output_surface.Pass(); | 61 return output_surface.Pass(); |
62 } | 62 } |
63 | 63 |
64 void LayerTreePixelTest::CommitCompleteOnThread(LayerTreeHostImpl* impl) { | 64 void LayerTreePixelTest::CommitCompleteOnThread(LayerTreeHostImpl* impl) { |
65 LayerTreeImpl* commit_tree = | 65 LayerTreeImpl* commit_tree = |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 | 371 |
372 *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point); | 372 *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point); |
373 *release_callback = SingleReleaseCallback::Create( | 373 *release_callback = SingleReleaseCallback::Create( |
374 base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox, | 374 base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox, |
375 base::Unretained(this), | 375 base::Unretained(this), |
376 base::Passed(&context), | 376 base::Passed(&context), |
377 texture_id)); | 377 texture_id)); |
378 } | 378 } |
379 | 379 |
380 } // namespace cc | 380 } // namespace cc |
OLD | NEW |