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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 new PixelTestSoftwareOutputDevice); | 46 new PixelTestSoftwareOutputDevice); |
47 software_output_device->set_surface_expansion_size( | 47 software_output_device->set_surface_expansion_size( |
48 surface_expansion_size); | 48 surface_expansion_size); |
49 output_surface = make_scoped_ptr( | 49 output_surface = make_scoped_ptr( |
50 new PixelTestOutputSurface(software_output_device.Pass())); | 50 new PixelTestOutputSurface(software_output_device.Pass())); |
51 break; | 51 break; |
52 } | 52 } |
53 case PIXEL_TEST_GL: { | 53 case PIXEL_TEST_GL: { |
54 bool flipped_output_surface = false; | 54 bool flipped_output_surface = false; |
55 output_surface = make_scoped_ptr(new PixelTestOutputSurface( | 55 output_surface = make_scoped_ptr(new PixelTestOutputSurface( |
56 new TestInProcessContextProvider, flipped_output_surface)); | 56 new TestInProcessContextProvider, new TestInProcessContextProvider, |
| 57 flipped_output_surface)); |
57 break; | 58 break; |
58 } | 59 } |
59 } | 60 } |
60 | 61 |
61 output_surface->set_surface_expansion_size(surface_expansion_size); | 62 output_surface->set_surface_expansion_size(surface_expansion_size); |
62 return output_surface.Pass(); | 63 return output_surface.Pass(); |
63 } | 64 } |
64 | 65 |
65 void LayerTreePixelTest::CommitCompleteOnThread(LayerTreeHostImpl* impl) { | 66 void LayerTreePixelTest::CommitCompleteOnThread(LayerTreeHostImpl* impl) { |
66 LayerTreeImpl* commit_tree = | 67 LayerTreeImpl* commit_tree = |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
375 | 376 |
376 *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point); | 377 *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point); |
377 *release_callback = SingleReleaseCallback::Create( | 378 *release_callback = SingleReleaseCallback::Create( |
378 base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox, | 379 base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox, |
379 base::Unretained(this), | 380 base::Unretained(this), |
380 base::Passed(&context), | 381 base::Passed(&context), |
381 texture_id)); | 382 texture_id)); |
382 } | 383 } |
383 | 384 |
384 } // namespace cc | 385 } // namespace cc |
OLD | NEW |