| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "CCScheduler.h" | 7 #include "CCScheduler.h" |
| 8 | 8 |
| 9 #include "cc/dcheck.h" |
| 9 #include "cc/test/scheduler_test_common.h" | 10 #include "cc/test/scheduler_test_common.h" |
| 10 #include "testing/gmock/include/gmock/gmock.h" | 11 #include "testing/gmock/include/gmock/gmock.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 13 |
| 13 using namespace cc; | 14 using namespace cc; |
| 14 using namespace WebKitTests; | 15 using namespace WebKitTests; |
| 15 using namespace WTF; | 16 using namespace WTF; |
| 16 | 17 |
| 17 namespace { | 18 namespace { |
| 18 | 19 |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossi
ble() OVERRIDE | 216 virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossi
ble() OVERRIDE |
| 216 { | 217 { |
| 217 // Only setNeedsRedraw the first time this is called | 218 // Only setNeedsRedraw the first time this is called |
| 218 if (!m_numDraws) | 219 if (!m_numDraws) |
| 219 m_scheduler->setNeedsRedraw(); | 220 m_scheduler->setNeedsRedraw(); |
| 220 return FakeCCSchedulerClient::scheduledActionDrawAndSwapIfPossible(); | 221 return FakeCCSchedulerClient::scheduledActionDrawAndSwapIfPossible(); |
| 221 } | 222 } |
| 222 | 223 |
| 223 virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced(
) OVERRIDE | 224 virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced(
) OVERRIDE |
| 224 { | 225 { |
| 225 ASSERT_NOT_REACHED(); | 226 NOTREACHED(); |
| 226 return CCScheduledActionDrawAndSwapResult(true, true); | 227 return CCScheduledActionDrawAndSwapResult(true, true); |
| 227 } | 228 } |
| 228 | 229 |
| 229 virtual void scheduledActionCommit() OVERRIDE { } | 230 virtual void scheduledActionCommit() OVERRIDE { } |
| 230 virtual void scheduledActionBeginContextRecreation() OVERRIDE { } | 231 virtual void scheduledActionBeginContextRecreation() OVERRIDE { } |
| 231 virtual void didAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE { } | 232 virtual void didAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE { } |
| 232 | 233 |
| 233 protected: | 234 protected: |
| 234 CCScheduler* m_scheduler; | 235 CCScheduler* m_scheduler; |
| 235 }; | 236 }; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossi
ble() OVERRIDE | 318 virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossi
ble() OVERRIDE |
| 318 { | 319 { |
| 319 // Only setNeedsCommit the first time this is called | 320 // Only setNeedsCommit the first time this is called |
| 320 if (!m_numDraws) | 321 if (!m_numDraws) |
| 321 m_scheduler->setNeedsCommit(); | 322 m_scheduler->setNeedsCommit(); |
| 322 return FakeCCSchedulerClient::scheduledActionDrawAndSwapIfPossible(); | 323 return FakeCCSchedulerClient::scheduledActionDrawAndSwapIfPossible(); |
| 323 } | 324 } |
| 324 | 325 |
| 325 virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced(
) OVERRIDE | 326 virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced(
) OVERRIDE |
| 326 { | 327 { |
| 327 ASSERT_NOT_REACHED(); | 328 NOTREACHED(); |
| 328 return CCScheduledActionDrawAndSwapResult(true, true); | 329 return CCScheduledActionDrawAndSwapResult(true, true); |
| 329 } | 330 } |
| 330 | 331 |
| 331 virtual void scheduledActionCommit() OVERRIDE { } | 332 virtual void scheduledActionCommit() OVERRIDE { } |
| 332 virtual void scheduledActionBeginContextRecreation() OVERRIDE { } | 333 virtual void scheduledActionBeginContextRecreation() OVERRIDE { } |
| 333 virtual void didAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE { } | 334 virtual void didAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE { } |
| 334 | 335 |
| 335 protected: | 336 protected: |
| 336 CCScheduler* m_scheduler; | 337 CCScheduler* m_scheduler; |
| 337 }; | 338 }; |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 // Get the compositor to do a scheduledActionDrawAndSwapForced. | 462 // Get the compositor to do a scheduledActionDrawAndSwapForced. |
| 462 scheduler->setNeedsRedraw(); | 463 scheduler->setNeedsRedraw(); |
| 463 scheduler->setNeedsForcedRedraw(); | 464 scheduler->setNeedsForcedRedraw(); |
| 464 EXPECT_TRUE(client.hasAction("scheduledActionDrawAndSwapForced")); | 465 EXPECT_TRUE(client.hasAction("scheduledActionDrawAndSwapForced")); |
| 465 | 466 |
| 466 // We should not have told the frame rate controller that we began a frame. | 467 // We should not have told the frame rate controller that we began a frame. |
| 467 EXPECT_EQ(0, controllerPtr->numFramesPending()); | 468 EXPECT_EQ(0, controllerPtr->numFramesPending()); |
| 468 } | 469 } |
| 469 | 470 |
| 470 } | 471 } |
| OLD | NEW |