| 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" | |
| 6 | |
| 7 #include "cc/scheduler.h" | 5 #include "cc/scheduler.h" |
| 8 | 6 |
| 9 #include "base/logging.h" | 7 #include "base/logging.h" |
| 10 #include "cc/test/scheduler_test_common.h" | 8 #include "cc/test/scheduler_test_common.h" |
| 11 #include "testing/gmock/include/gmock/gmock.h" | 9 #include "testing/gmock/include/gmock/gmock.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 13 | 11 |
| 14 using namespace cc; | 12 using namespace cc; |
| 15 using namespace WebKitTests; | 13 using namespace WebKitTests; |
| 16 | 14 |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 // Get the compositor to do a scheduledActionDrawAndSwapForced. | 459 // Get the compositor to do a scheduledActionDrawAndSwapForced. |
| 462 scheduler->setNeedsRedraw(); | 460 scheduler->setNeedsRedraw(); |
| 463 scheduler->setNeedsForcedRedraw(); | 461 scheduler->setNeedsForcedRedraw(); |
| 464 EXPECT_TRUE(client.hasAction("scheduledActionDrawAndSwapForced")); | 462 EXPECT_TRUE(client.hasAction("scheduledActionDrawAndSwapForced")); |
| 465 | 463 |
| 466 // We should not have told the frame rate controller that we began a frame. | 464 // We should not have told the frame rate controller that we began a frame. |
| 467 EXPECT_EQ(0, controllerPtr->numFramesPending()); | 465 EXPECT_EQ(0, controllerPtr->numFramesPending()); |
| 468 } | 466 } |
| 469 | 467 |
| 470 } // anonymous namespace | 468 } // anonymous namespace |
| OLD | NEW |