| 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 25 matching lines...) Expand all Loading... |
| 36 } | 36 } |
| 37 | 37 |
| 38 gfx::Size SurfaceSize() { | 38 gfx::Size SurfaceSize() { |
| 39 static gfx::Size size(5, 5); | 39 static gfx::Size size(5, 5); |
| 40 return size; | 40 return size; |
| 41 } | 41 } |
| 42 | 42 |
| 43 class EmptySurfaceFactoryClient : public SurfaceFactoryClient { | 43 class EmptySurfaceFactoryClient : public SurfaceFactoryClient { |
| 44 public: | 44 public: |
| 45 virtual void ReturnResources( | 45 virtual void ReturnResources( |
| 46 const ReturnedResourceArray& resources) OVERRIDE {} | 46 const ReturnedResourceArray& resources) override {} |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 class SurfaceAggregatorTest : public testing::Test { | 49 class SurfaceAggregatorTest : public testing::Test { |
| 50 public: | 50 public: |
| 51 SurfaceAggregatorTest() | 51 SurfaceAggregatorTest() |
| 52 : factory_(&manager_, &empty_client_), aggregator_(&manager_, NULL) {} | 52 : factory_(&manager_, &empty_client_), aggregator_(&manager_, NULL) {} |
| 53 | 53 |
| 54 protected: | 54 protected: |
| 55 SurfaceManager manager_; | 55 SurfaceManager manager_; |
| 56 EmptySurfaceFactoryClient empty_client_; | 56 EmptySurfaceFactoryClient empty_client_; |
| (...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1054 scoped_ptr<ResourceProvider> resource_provider_; | 1054 scoped_ptr<ResourceProvider> resource_provider_; |
| 1055 scoped_ptr<SurfaceAggregator> aggregator_; | 1055 scoped_ptr<SurfaceAggregator> aggregator_; |
| 1056 }; | 1056 }; |
| 1057 | 1057 |
| 1058 class ResourceTrackingSurfaceFactoryClient : public SurfaceFactoryClient { | 1058 class ResourceTrackingSurfaceFactoryClient : public SurfaceFactoryClient { |
| 1059 public: | 1059 public: |
| 1060 ResourceTrackingSurfaceFactoryClient() {} | 1060 ResourceTrackingSurfaceFactoryClient() {} |
| 1061 virtual ~ResourceTrackingSurfaceFactoryClient() {} | 1061 virtual ~ResourceTrackingSurfaceFactoryClient() {} |
| 1062 | 1062 |
| 1063 virtual void ReturnResources( | 1063 virtual void ReturnResources( |
| 1064 const ReturnedResourceArray& resources) OVERRIDE { | 1064 const ReturnedResourceArray& resources) override { |
| 1065 returned_resources_ = resources; | 1065 returned_resources_ = resources; |
| 1066 } | 1066 } |
| 1067 | 1067 |
| 1068 ReturnedResourceArray returned_resources() const { | 1068 ReturnedResourceArray returned_resources() const { |
| 1069 return returned_resources_; | 1069 return returned_resources_; |
| 1070 } | 1070 } |
| 1071 | 1071 |
| 1072 private: | 1072 private: |
| 1073 ReturnedResourceArray returned_resources_; | 1073 ReturnedResourceArray returned_resources_; |
| 1074 | 1074 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1144 returned_ids[i] = client.returned_resources()[i].id; | 1144 returned_ids[i] = client.returned_resources()[i].id; |
| 1145 } | 1145 } |
| 1146 EXPECT_THAT(returned_ids, | 1146 EXPECT_THAT(returned_ids, |
| 1147 testing::WhenSorted(testing::ElementsAreArray(ids))); | 1147 testing::WhenSorted(testing::ElementsAreArray(ids))); |
| 1148 factory.Destroy(surface_id); | 1148 factory.Destroy(surface_id); |
| 1149 } | 1149 } |
| 1150 | 1150 |
| 1151 } // namespace | 1151 } // namespace |
| 1152 } // namespace cc | 1152 } // namespace cc |
| 1153 | 1153 |
| OLD | NEW |