| 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/prioritized_resource_manager.h" | 
| 8 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread | 8 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread | 
| 9 #include "cc/test/fake_output_surface.h" | 9 #include "cc/test/fake_output_surface.h" | 
| 10 #include "cc/test/fake_proxy.h" | 10 #include "cc/test/fake_proxy.h" | 
| 11 #include "cc/test/fake_web_graphics_context_3d.h" |  | 
| 12 #include "cc/test/scheduler_test_common.h" | 11 #include "cc/test/scheduler_test_common.h" | 
|  | 12 #include "cc/test/test_web_graphics_context_3d.h" | 
| 13 #include "cc/test/tiled_layer_test_common.h" | 13 #include "cc/test/tiled_layer_test_common.h" | 
| 14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" | 
| 15 #include "third_party/khronos/GLES2/gl2ext.h" | 15 #include "third_party/khronos/GLES2/gl2ext.h" | 
| 16 | 16 | 
| 17 using namespace WebKit; | 17 using namespace WebKit; | 
| 18 using testing::Test; | 18 using testing::Test; | 
| 19 | 19 | 
| 20 namespace cc { | 20 namespace cc { | 
| 21 namespace { | 21 namespace { | 
| 22 | 22 | 
| 23 const int kFlushPeriodFull = 4; | 23 const int kFlushPeriodFull = 4; | 
| 24 const int kFlushPeriodPartial = kFlushPeriodFull; | 24 const int kFlushPeriodPartial = kFlushPeriodFull; | 
| 25 | 25 | 
| 26 class ResourceUpdateControllerTest; | 26 class ResourceUpdateControllerTest; | 
| 27 | 27 | 
| 28 class WebGraphicsContext3DForUploadTest : public FakeWebGraphicsContext3D { | 28 class WebGraphicsContext3DForUploadTest : public TestWebGraphicsContext3D { | 
| 29 public: | 29 public: | 
| 30     WebGraphicsContext3DForUploadTest(ResourceUpdateControllerTest *test) | 30     WebGraphicsContext3DForUploadTest(ResourceUpdateControllerTest *test) | 
| 31         : m_test(test) | 31         : m_test(test) | 
| 32         , m_supportShallowFlush(true) | 32         , m_supportShallowFlush(true) | 
| 33     { } | 33     { } | 
| 34 | 34 | 
| 35     virtual void flush(void); | 35     virtual void flush(void); | 
| 36     virtual void shallowFlushCHROMIUM(void); | 36     virtual void shallowFlushCHROMIUM(void); | 
| 37     virtual void texSubImage2D(WGC3Denum target, | 37     virtual void texSubImage2D(WGC3Denum target, | 
| 38                                WGC3Dint level, | 38                                WGC3Dint level, | 
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 497             runPendingTask(&thread, controller.get()); | 497             runPendingTask(&thread, controller.get()); | 
| 498     } | 498     } | 
| 499 | 499 | 
| 500     EXPECT_FALSE(thread.hasPendingTask()); | 500     EXPECT_FALSE(thread.hasPendingTask()); | 
| 501     EXPECT_TRUE(client.readyToFinalizeCalled()); | 501     EXPECT_TRUE(client.readyToFinalizeCalled()); | 
| 502     EXPECT_EQ(2, m_numTotalUploads); | 502     EXPECT_EQ(2, m_numTotalUploads); | 
| 503 } | 503 } | 
| 504 | 504 | 
| 505 }  // namespace | 505 }  // namespace | 
| 506 }  // namespace cc | 506 }  // namespace cc | 
| OLD | NEW | 
|---|