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

Unified Diff: cc/scheduler_unittest.cc

Issue 11361223: cc: Remove cc::settings, move them to LayerTreeSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Using WebLayerTreeSettings for things WebKit can set Created 8 years, 1 month 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
Index: cc/scheduler_unittest.cc
diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc
index 2441716f57c81656e75a15c5acd487d60d8ef48e..a9d61e93a0bf9d06b0bf0abbff655c27c1b4a2e3 100644
--- a/cc/scheduler_unittest.cc
+++ b/cc/scheduler_unittest.cc
@@ -55,6 +55,7 @@ public:
virtual void scheduledActionBeginContextRecreation() OVERRIDE { m_actions.push_back("scheduledActionBeginContextRecreation"); }
virtual void scheduledActionAcquireLayerTexturesForMainThread() OVERRIDE { m_actions.push_back("scheduledActionAcquireLayerTexturesForMainThread"); }
virtual void didAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE { }
+ virtual const LayerTreeSettings& settings() const OVERRIDE { return m_settings; }
void setDrawWillHappen(bool drawWillHappen) { m_drawWillHappen = drawWillHappen; }
void setSwapWillHappenIfDrawHappens(bool swapWillHappenIfDrawHappens) { m_swapWillHappenIfDrawHappens = swapWillHappenIfDrawHappens; }
@@ -64,6 +65,7 @@ protected:
bool m_swapWillHappenIfDrawHappens;
int m_numDraws;
std::vector<const char*> m_actions;
+ LayerTreeSettings m_settings;
};
TEST(SchedulerTest, RequestCommit)
« cc/layer_tree_host.cc ('K') | « cc/scheduler_state_machine.cc ('k') | cc/settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698