| 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 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1121 make_scoped_ptr(new SoftwareOutputDevice)); | 1121 make_scoped_ptr(new SoftwareOutputDevice)); |
| 1122 output_surface_->BindToClient(&output_surface_client_); | 1122 output_surface_->BindToClient(&output_surface_client_); |
| 1123 shared_bitmap_manager_.reset(new TestSharedBitmapManager); | 1123 shared_bitmap_manager_.reset(new TestSharedBitmapManager); |
| 1124 | 1124 |
| 1125 resource_provider_ = ResourceProvider::Create(output_surface_.get(), | 1125 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
| 1126 shared_bitmap_manager_.get(), | 1126 shared_bitmap_manager_.get(), |
| 1127 NULL, | 1127 NULL, |
| 1128 NULL, | 1128 NULL, |
| 1129 0, | 1129 0, |
| 1130 false, | 1130 false, |
| 1131 1, | 1131 1); |
| 1132 false); | |
| 1133 | 1132 |
| 1134 aggregator_.reset( | 1133 aggregator_.reset( |
| 1135 new SurfaceAggregator(&manager_, resource_provider_.get())); | 1134 new SurfaceAggregator(&manager_, resource_provider_.get())); |
| 1136 } | 1135 } |
| 1137 | 1136 |
| 1138 protected: | 1137 protected: |
| 1139 SurfaceManager manager_; | 1138 SurfaceManager manager_; |
| 1140 FakeOutputSurfaceClient output_surface_client_; | 1139 FakeOutputSurfaceClient output_surface_client_; |
| 1141 scoped_ptr<OutputSurface> output_surface_; | 1140 scoped_ptr<OutputSurface> output_surface_; |
| 1142 scoped_ptr<SharedBitmapManager> shared_bitmap_manager_; | 1141 scoped_ptr<SharedBitmapManager> shared_bitmap_manager_; |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1233 returned_ids[i] = client.returned_resources()[i].id; | 1232 returned_ids[i] = client.returned_resources()[i].id; |
| 1234 } | 1233 } |
| 1235 EXPECT_THAT(returned_ids, | 1234 EXPECT_THAT(returned_ids, |
| 1236 testing::WhenSorted(testing::ElementsAreArray(ids))); | 1235 testing::WhenSorted(testing::ElementsAreArray(ids))); |
| 1237 factory.Destroy(surface_id); | 1236 factory.Destroy(surface_id); |
| 1238 } | 1237 } |
| 1239 | 1238 |
| 1240 } // namespace | 1239 } // namespace |
| 1241 } // namespace cc | 1240 } // namespace cc |
| 1242 | 1241 |
| OLD | NEW |