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 "cc/scheduler.h" | 7 #include "cc/scheduler.h" |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "cc/test/scheduler_test_common.h" | 10 #include "cc/test/scheduler_test_common.h" |
11 #include "testing/gmock/include/gmock/gmock.h" | 11 #include "testing/gmock/include/gmock/gmock.h" |
12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
13 | 13 |
14 using namespace cc; | |
15 using namespace WebKitTests; | 14 using namespace WebKitTests; |
16 | 15 |
| 16 namespace cc { |
17 namespace { | 17 namespace { |
18 | 18 |
19 class FakeSchedulerClient : public SchedulerClient { | 19 class FakeSchedulerClient : public SchedulerClient { |
20 public: | 20 public: |
21 FakeSchedulerClient() { reset(); } | 21 FakeSchedulerClient() { reset(); } |
22 void reset() | 22 void reset() |
23 { | 23 { |
24 m_actions.clear(); | 24 m_actions.clear(); |
25 m_drawWillHappen = true; | 25 m_drawWillHappen = true; |
26 m_swapWillHappenIfDrawHappens = true; | 26 m_swapWillHappenIfDrawHappens = true; |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
460 | 460 |
461 // Get the compositor to do a scheduledActionDrawAndSwapForced. | 461 // Get the compositor to do a scheduledActionDrawAndSwapForced. |
462 scheduler->setNeedsRedraw(); | 462 scheduler->setNeedsRedraw(); |
463 scheduler->setNeedsForcedRedraw(); | 463 scheduler->setNeedsForcedRedraw(); |
464 EXPECT_TRUE(client.hasAction("scheduledActionDrawAndSwapForced")); | 464 EXPECT_TRUE(client.hasAction("scheduledActionDrawAndSwapForced")); |
465 | 465 |
466 // We should not have told the frame rate controller that we began a frame. | 466 // We should not have told the frame rate controller that we began a frame. |
467 EXPECT_EQ(0, controllerPtr->numFramesPending()); | 467 EXPECT_EQ(0, controllerPtr->numFramesPending()); |
468 } | 468 } |
469 | 469 |
470 } // anonymous namespace | 470 } // namespace |
| 471 } // namespace cc |
OLD | NEW |