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