OLD | NEW |
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/quads/render_pass.h" | 7 #include "cc/quads/render_pass.h" |
8 #include "cc/quads/render_pass_draw_quad.h" | 8 #include "cc/quads/render_pass_draw_quad.h" |
9 #include "cc/quads/solid_color_draw_quad.h" | 9 #include "cc/quads/solid_color_draw_quad.h" |
10 #include "cc/quads/surface_draw_quad.h" | 10 #include "cc/quads/surface_draw_quad.h" |
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
964 class SurfaceAggregatorWithResourcesTest : public testing::Test { | 964 class SurfaceAggregatorWithResourcesTest : public testing::Test { |
965 public: | 965 public: |
966 virtual void SetUp() { | 966 virtual void SetUp() { |
967 output_surface_ = FakeOutputSurface::CreateSoftware( | 967 output_surface_ = FakeOutputSurface::CreateSoftware( |
968 make_scoped_ptr(new SoftwareOutputDevice)); | 968 make_scoped_ptr(new SoftwareOutputDevice)); |
969 output_surface_->BindToClient(&output_surface_client_); | 969 output_surface_->BindToClient(&output_surface_client_); |
970 shared_bitmap_manager_.reset(new TestSharedBitmapManager); | 970 shared_bitmap_manager_.reset(new TestSharedBitmapManager); |
971 | 971 |
972 resource_provider_ = ResourceProvider::Create(output_surface_.get(), | 972 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
973 shared_bitmap_manager_.get(), | 973 shared_bitmap_manager_.get(), |
| 974 NULL, |
974 0, | 975 0, |
975 false, | 976 false, |
976 1, | 977 1, |
977 false); | 978 false); |
978 | 979 |
979 aggregator_.reset( | 980 aggregator_.reset( |
980 new SurfaceAggregator(&manager_, resource_provider_.get())); | 981 new SurfaceAggregator(&manager_, resource_provider_.get())); |
981 } | 982 } |
982 | 983 |
983 protected: | 984 protected: |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1078 returned_ids[i] = client.returned_resources()[i].id; | 1079 returned_ids[i] = client.returned_resources()[i].id; |
1079 } | 1080 } |
1080 EXPECT_THAT(returned_ids, | 1081 EXPECT_THAT(returned_ids, |
1081 testing::WhenSorted(testing::ElementsAreArray(ids))); | 1082 testing::WhenSorted(testing::ElementsAreArray(ids))); |
1082 factory.Destroy(surface_id); | 1083 factory.Destroy(surface_id); |
1083 } | 1084 } |
1084 | 1085 |
1085 } // namespace | 1086 } // namespace |
1086 } // namespace cc | 1087 } // namespace cc |
1087 | 1088 |
OLD | NEW |