| 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 "CCTextureUpdateController.h" |
| 8 | 8 |
| 9 #include "CCSchedulerTestCommon.h" | 9 #include "CCSchedulerTestCommon.h" |
| 10 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread | 10 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 } | 147 } |
| 148 | 148 |
| 149 m_numEndUploads++; | 149 m_numEndUploads++; |
| 150 } | 150 } |
| 151 | 151 |
| 152 protected: | 152 protected: |
| 153 virtual void SetUp() | 153 virtual void SetUp() |
| 154 { | 154 { |
| 155 m_context = FakeWebCompositorOutputSurface::create(adoptPtr(new WebGraph
icsContext3DForUploadTest(this))); | 155 m_context = FakeWebCompositorOutputSurface::create(adoptPtr(new WebGraph
icsContext3DForUploadTest(this))); |
| 156 DebugScopedSetImplThread implThread; | 156 DebugScopedSetImplThread implThread; |
| 157 m_resourceProvider = CCResourceProvider::create(m_context.get(), Unthrot
tledUploader); | 157 m_resourceProvider = CCResourceProvider::create(m_context.get()); |
| 158 } | 158 } |
| 159 | 159 |
| 160 void appendFullUploadsToUpdateQueue(int count) | 160 void appendFullUploadsToUpdateQueue(int count) |
| 161 { | 161 { |
| 162 m_fullUploadCountExpected += count; | 162 m_fullUploadCountExpected += count; |
| 163 m_totalUploadCountExpected += count; | 163 m_totalUploadCountExpected += count; |
| 164 | 164 |
| 165 const IntRect rect(0, 0, 300, 150); | 165 const IntRect rect(0, 0, 300, 150); |
| 166 const TextureUploader::Parameters upload = { &m_texture, rect, IntSize()
}; | 166 const TextureUploader::Parameters upload = { &m_texture, rect, IntSize()
}; |
| 167 for (int i = 0; i < count; i++) | 167 for (int i = 0; i < count; i++) |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 } | 490 } |
| 491 | 491 |
| 492 EXPECT_FALSE(thread.hasPendingTask()); | 492 EXPECT_FALSE(thread.hasPendingTask()); |
| 493 EXPECT_TRUE(client.readyToFinalizeCalled()); | 493 EXPECT_TRUE(client.readyToFinalizeCalled()); |
| 494 EXPECT_EQ(2, m_numBeginUploads); | 494 EXPECT_EQ(2, m_numBeginUploads); |
| 495 EXPECT_EQ(2, m_numEndUploads); | 495 EXPECT_EQ(2, m_numEndUploads); |
| 496 EXPECT_EQ(2, m_numTotalUploads); | 496 EXPECT_EQ(2, m_numTotalUploads); |
| 497 } | 497 } |
| 498 | 498 |
| 499 } // namespace | 499 } // namespace |
| OLD | NEW |