| 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" |
| 11 #include "cc/test/fake_proxy.h" | 11 #include "cc/test/fake_proxy.h" |
| 12 #include "cc/test/scheduler_test_common.h" | 12 #include "cc/test/scheduler_test_common.h" |
| 13 #include "cc/test/test_web_graphics_context_3d.h" | 13 #include "cc/test/test_web_graphics_context_3d.h" |
| 14 #include "cc/test/tiled_layer_test_common.h" | 14 #include "cc/test/tiled_layer_test_common.h" |
| 15 #include "cc/trees/single_thread_proxy.h" // For DebugScopedSetImplThread | 15 #include "cc/trees/single_thread_proxy.h" // For DebugScopedSetImplThread |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "third_party/khronos/GLES2/gl2ext.h" | 17 #include "third_party/khronos/GLES2/gl2ext.h" |
| 18 | 18 |
| 19 using testing::Test; | 19 using testing::Test; |
| 20 using WebKit::WGC3Denum; | 20 using blink::WGC3Denum; |
| 21 using WebKit::WGC3Dint; | 21 using blink::WGC3Dint; |
| 22 using WebKit::WGC3Duint; | 22 using blink::WGC3Duint; |
| 23 using WebKit::WGC3Dsizei; | 23 using blink::WGC3Dsizei; |
| 24 using WebKit::WebGLId; | 24 using blink::WebGLId; |
| 25 using WebKit::WebString; | 25 using blink::WebString; |
| 26 | 26 |
| 27 namespace cc { | 27 namespace cc { |
| 28 namespace { | 28 namespace { |
| 29 | 29 |
| 30 const int kFlushPeriodFull = 4; | 30 const int kFlushPeriodFull = 4; |
| 31 const int kFlushPeriodPartial = kFlushPeriodFull; | 31 const int kFlushPeriodPartial = kFlushPeriodFull; |
| 32 | 32 |
| 33 class ResourceUpdateControllerTest; | 33 class ResourceUpdateControllerTest; |
| 34 | 34 |
| 35 class WebGraphicsContext3DForUploadTest : public TestWebGraphicsContext3D { | 35 class WebGraphicsContext3DForUploadTest : public TestWebGraphicsContext3D { |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 RunPendingTask(task_runner.get(), controller.get()); | 510 RunPendingTask(task_runner.get(), controller.get()); |
| 511 } | 511 } |
| 512 | 512 |
| 513 EXPECT_FALSE(task_runner->HasPendingTask()); | 513 EXPECT_FALSE(task_runner->HasPendingTask()); |
| 514 EXPECT_TRUE(client.ReadyToFinalizeCalled()); | 514 EXPECT_TRUE(client.ReadyToFinalizeCalled()); |
| 515 EXPECT_EQ(2, num_total_uploads_); | 515 EXPECT_EQ(2, num_total_uploads_); |
| 516 } | 516 } |
| 517 | 517 |
| 518 } // namespace | 518 } // namespace |
| 519 } // namespace cc | 519 } // namespace cc |
| OLD | NEW |