Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: cc/scheduler_unittest.cc

Issue 11145033: cc: Get rid of CC*.h temporary header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased - fixed the conflicts hopefuly Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/scheduler_state_machine_unittest.cc ('k') | cc/scoped_texture.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "cc/scheduler.h"
8 8
9 #include "cc/test/scheduler_test_common.h" 9 #include "cc/test/scheduler_test_common.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 using namespace cc; 13 using namespace cc;
14 using namespace WebKitTests; 14 using namespace WebKitTests;
15 using namespace WTF; 15 using namespace WTF;
16 16
17 namespace { 17 namespace {
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 } 470 }
OLDNEW
« no previous file with comments | « cc/scheduler_state_machine_unittest.cc ('k') | cc/scoped_texture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698