OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/resources/resource_update_controller.h" | 5 #include "cc/resources/resource_update_controller.h" |
6 | 6 |
7 #include "base/test/test_simple_task_runner.h" | 7 #include "base/test/test_simple_task_runner.h" |
8 #include "cc/resources/prioritized_resource_manager.h" | 8 #include "cc/resources/prioritized_resource_manager.h" |
9 #include "cc/test/fake_output_surface.h" | 9 #include "cc/test/fake_output_surface.h" |
10 #include "cc/test/fake_output_surface_client.h" | 10 #include "cc/test/fake_output_surface_client.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 | 121 |
122 output_surface_ = FakeOutputSurface::Create3d( | 122 output_surface_ = FakeOutputSurface::Create3d( |
123 scoped_ptr<TestWebGraphicsContext3D>( | 123 scoped_ptr<TestWebGraphicsContext3D>( |
124 new WebGraphicsContext3DForUploadTest(this))); | 124 new WebGraphicsContext3DForUploadTest(this))); |
125 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 125 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
126 | 126 |
127 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 127 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
128 resource_provider_ = ResourceProvider::Create(output_surface_.get(), | 128 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
129 shared_bitmap_manager_.get(), | 129 shared_bitmap_manager_.get(), |
130 NULL, | 130 NULL, |
| 131 NULL, |
131 0, | 132 0, |
132 false, | 133 false, |
133 1, | 134 1, |
134 false); | 135 false); |
135 } | 136 } |
136 | 137 |
137 void AppendFullUploadsOfIndexedTextureToUpdateQueue(int count, | 138 void AppendFullUploadsOfIndexedTextureToUpdateQueue(int count, |
138 int texture_index) { | 139 int texture_index) { |
139 full_upload_count_expected_ += count; | 140 full_upload_count_expected_ += count; |
140 total_upload_count_expected_ += count; | 141 total_upload_count_expected_ += count; |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 RunPendingTask(task_runner.get(), controller.get()); | 509 RunPendingTask(task_runner.get(), controller.get()); |
509 } | 510 } |
510 | 511 |
511 EXPECT_FALSE(task_runner->HasPendingTask()); | 512 EXPECT_FALSE(task_runner->HasPendingTask()); |
512 EXPECT_TRUE(client.ReadyToFinalizeCalled()); | 513 EXPECT_TRUE(client.ReadyToFinalizeCalled()); |
513 EXPECT_EQ(2, num_total_uploads_); | 514 EXPECT_EQ(2, num_total_uploads_); |
514 } | 515 } |
515 | 516 |
516 } // namespace | 517 } // namespace |
517 } // namespace cc | 518 } // namespace cc |
OLD | NEW |