| 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/resource_update_controller.h" | 5 #include "cc/resource_update_controller.h" |
| 6 | 6 |
| 7 #include "cc/prioritized_resource_manager.h" |
| 7 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread | 8 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread |
| 8 #include "cc/test/fake_output_surface.h" | 9 #include "cc/test/fake_output_surface.h" |
| 9 #include "cc/test/fake_proxy.h" | 10 #include "cc/test/fake_proxy.h" |
| 10 #include "cc/test/fake_web_graphics_context_3d.h" | 11 #include "cc/test/fake_web_graphics_context_3d.h" |
| 11 #include "cc/test/scheduler_test_common.h" | 12 #include "cc/test/scheduler_test_common.h" |
| 12 #include "cc/test/tiled_layer_test_common.h" | 13 #include "cc/test/tiled_layer_test_common.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
| 14 #include "third_party/khronos/GLES2/gl2ext.h" | 15 #include "third_party/khronos/GLES2/gl2ext.h" |
| 15 | 16 |
| 16 using namespace WebKit; | 17 using namespace WebKit; |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 runPendingTask(&thread, controller.get()); | 497 runPendingTask(&thread, controller.get()); |
| 497 } | 498 } |
| 498 | 499 |
| 499 EXPECT_FALSE(thread.hasPendingTask()); | 500 EXPECT_FALSE(thread.hasPendingTask()); |
| 500 EXPECT_TRUE(client.readyToFinalizeCalled()); | 501 EXPECT_TRUE(client.readyToFinalizeCalled()); |
| 501 EXPECT_EQ(2, m_numTotalUploads); | 502 EXPECT_EQ(2, m_numTotalUploads); |
| 502 } | 503 } |
| 503 | 504 |
| 504 } // namespace | 505 } // namespace |
| 505 } // namespace cc | 506 } // namespace cc |
| OLD | NEW |