| 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 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 public: | 1030 public: |
| 1031 virtual void SetUp() { | 1031 virtual void SetUp() { |
| 1032 output_surface_ = FakeOutputSurface::CreateSoftware( | 1032 output_surface_ = FakeOutputSurface::CreateSoftware( |
| 1033 make_scoped_ptr(new SoftwareOutputDevice)); | 1033 make_scoped_ptr(new SoftwareOutputDevice)); |
| 1034 output_surface_->BindToClient(&output_surface_client_); | 1034 output_surface_->BindToClient(&output_surface_client_); |
| 1035 shared_bitmap_manager_.reset(new TestSharedBitmapManager); | 1035 shared_bitmap_manager_.reset(new TestSharedBitmapManager); |
| 1036 | 1036 |
| 1037 resource_provider_ = ResourceProvider::Create(output_surface_.get(), | 1037 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
| 1038 shared_bitmap_manager_.get(), | 1038 shared_bitmap_manager_.get(), |
| 1039 NULL, | 1039 NULL, |
| 1040 NULL, |
| 1040 0, | 1041 0, |
| 1041 false, | 1042 false, |
| 1042 1, | 1043 1, |
| 1043 false); | 1044 false); |
| 1044 | 1045 |
| 1045 aggregator_.reset( | 1046 aggregator_.reset( |
| 1046 new SurfaceAggregator(&manager_, resource_provider_.get())); | 1047 new SurfaceAggregator(&manager_, resource_provider_.get())); |
| 1047 } | 1048 } |
| 1048 | 1049 |
| 1049 protected: | 1050 protected: |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1144 returned_ids[i] = client.returned_resources()[i].id; | 1145 returned_ids[i] = client.returned_resources()[i].id; |
| 1145 } | 1146 } |
| 1146 EXPECT_THAT(returned_ids, | 1147 EXPECT_THAT(returned_ids, |
| 1147 testing::WhenSorted(testing::ElementsAreArray(ids))); | 1148 testing::WhenSorted(testing::ElementsAreArray(ids))); |
| 1148 factory.Destroy(surface_id); | 1149 factory.Destroy(surface_id); |
| 1149 } | 1150 } |
| 1150 | 1151 |
| 1151 } // namespace | 1152 } // namespace |
| 1152 } // namespace cc | 1153 } // namespace cc |
| 1153 | 1154 |
| OLD | NEW |