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

Unified Diff: cc/test/scheduler_test_common.h

Issue 12965007: Fix cpplint errors in cc/(animation|input|layers|trees|test)/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/render_pass_test_utils.cc ('k') | cc/test/test_web_graphics_context_3d.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/scheduler_test_common.h
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 521def9b1a4220ec9db532e6af4c9afe0b682c77..b3b2c2dd128b798ca7acd54dca66f4612706cf19 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -5,6 +5,7 @@
#ifndef CC_TEST_SCHEDULER_TEST_COMMON_H_
#define CC_TEST_SCHEDULER_TEST_COMMON_H_
+#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "cc/base/thread.h"
@@ -45,7 +46,7 @@ class FakeThread : public cc::Thread {
bool HasPendingTask() const { return pending_task_; }
void RunPendingTask();
- long long PendingDelayMs() const {
+ int64 PendingDelayMs() const {
EXPECT_TRUE(HasPendingTask());
return pending_task_delay_;
}
@@ -57,7 +58,7 @@ class FakeThread : public cc::Thread {
protected:
scoped_ptr<base::Closure> pending_task_;
- long long pending_task_delay_;
+ int64 pending_task_delay_;
bool run_pending_task_on_overwrite_;
};
@@ -111,7 +112,7 @@ class FakeDelayBasedTimeSource : public cc::DelayBasedTimeSource {
class FakeFrameRateController : public cc::FrameRateController {
public:
- FakeFrameRateController(scoped_refptr<cc::TimeSource> timer)
+ explicit FakeFrameRateController(scoped_refptr<cc::TimeSource> timer)
: cc::FrameRateController(timer) {}
int NumFramesPending() const { return num_frames_pending_; }
« no previous file with comments | « cc/test/render_pass_test_utils.cc ('k') | cc/test/test_web_graphics_context_3d.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698