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/single_thread_proxy.h" // For DebugScopedSetImplThread | 7 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread |
8 #include "cc/test/fake_output_surface.h" | 8 #include "cc/test/fake_output_surface.h" |
9 #include "cc/test/fake_proxy.h" | 9 #include "cc/test/fake_proxy.h" |
10 #include "cc/test/fake_web_graphics_context_3d.h" | 10 #include "cc/test/fake_web_graphics_context_3d.h" |
11 #include "cc/test/scheduler_test_common.h" | 11 #include "cc/test/scheduler_test_common.h" |
12 #include "cc/test/tiled_layer_test_common.h" | 12 #include "cc/test/tiled_layer_test_common.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
14 #include "third_party/khronos/GLES2/gl2ext.h" | 14 #include "third_party/khronos/GLES2/gl2ext.h" |
15 | 15 |
16 using namespace WebKit; | 16 using namespace WebKit; |
17 using namespace WebKitTests; | |
18 using testing::Test; | 17 using testing::Test; |
19 | 18 |
20 namespace cc { | 19 namespace cc { |
21 namespace { | 20 namespace { |
22 | 21 |
23 const int kFlushPeriodFull = 4; | 22 const int kFlushPeriodFull = 4; |
24 const int kFlushPeriodPartial = kFlushPeriodFull; | 23 const int kFlushPeriodPartial = kFlushPeriodFull; |
25 | 24 |
26 class ResourceUpdateControllerTest; | 25 class ResourceUpdateControllerTest; |
27 | 26 |
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
497 runPendingTask(&thread, controller.get()); | 496 runPendingTask(&thread, controller.get()); |
498 } | 497 } |
499 | 498 |
500 EXPECT_FALSE(thread.hasPendingTask()); | 499 EXPECT_FALSE(thread.hasPendingTask()); |
501 EXPECT_TRUE(client.readyToFinalizeCalled()); | 500 EXPECT_TRUE(client.readyToFinalizeCalled()); |
502 EXPECT_EQ(2, m_numTotalUploads); | 501 EXPECT_EQ(2, m_numTotalUploads); |
503 } | 502 } |
504 | 503 |
505 } // namespace | 504 } // namespace |
506 } // namespace cc | 505 } // namespace cc |
OLD | NEW |