| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "CCTextureUpdateController.h" | 7 #include "cc/texture_update_controller.h" |
| 8 | 8 |
| 9 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread | 9 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread |
| 10 #include "cc/test/fake_web_compositor_output_surface.h" | 10 #include "cc/test/fake_web_compositor_output_surface.h" |
| 11 #include "cc/test/fake_web_graphics_context_3d.h" | 11 #include "cc/test/fake_web_graphics_context_3d.h" |
| 12 #include "cc/test/scheduler_test_common.h" | 12 #include "cc/test/scheduler_test_common.h" |
| 13 #include "cc/test/tiled_layer_test_common.h" | 13 #include "cc/test/tiled_layer_test_common.h" |
| 14 #include "cc/test/web_compositor_initializer.h" | 14 #include "cc/test/web_compositor_initializer.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 16 #include <public/WebThread.h> | 16 #include <public/WebThread.h> |
| 17 #include <wtf/RefPtr.h> | 17 #include <wtf/RefPtr.h> |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 if (thread.hasPendingTask()) | 454 if (thread.hasPendingTask()) |
| 455 runPendingTask(&thread, controller.get()); | 455 runPendingTask(&thread, controller.get()); |
| 456 } | 456 } |
| 457 | 457 |
| 458 EXPECT_FALSE(thread.hasPendingTask()); | 458 EXPECT_FALSE(thread.hasPendingTask()); |
| 459 EXPECT_TRUE(client.readyToFinalizeCalled()); | 459 EXPECT_TRUE(client.readyToFinalizeCalled()); |
| 460 EXPECT_EQ(2, m_numTotalUploads); | 460 EXPECT_EQ(2, m_numTotalUploads); |
| 461 } | 461 } |
| 462 | 462 |
| 463 } // namespace | 463 } // namespace |
| OLD | NEW |