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

Unified Diff: cc/test/layer_tree_test.h

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 years, 7 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
Index: cc/test/layer_tree_test.h
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index ffba9e88c2d8026a8bee7e2f5999da6e8dffc91f..25cbf43c7c08189d0be833c14853f6c0d682a822 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -155,10 +155,13 @@ class LayerTreeTest : public testing::Test, public TestHooks {
verify_property_trees_ = verify_property_trees;
}
+ const LayerSettings& layer_settings() { return layer_settings_; }
+
protected:
LayerTreeTest();
virtual void InitializeSettings(LayerTreeSettings* settings) {}
+ virtual void InitializeLayerSettings(LayerSettings* layer_settings) {}
void RealEndTest();
@@ -220,6 +223,8 @@ class LayerTreeTest : public testing::Test, public TestHooks {
private:
LayerTreeSettings settings_;
+ LayerSettings layer_settings_;
+
scoped_ptr<LayerTreeHostClientForTesting> client_;
scoped_ptr<LayerTreeHost> layer_tree_host_;
FakeOutputSurface* output_surface_;

Powered by Google App Engine
This is Rietveld 408576698