| Index: cc/test/layer_tree_test.h
|
| diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
|
| index 7b48f3f15917d359c593bf0a236a5ce2a3ff6a18..cbda75ee1f52836680c4d3fa4f543feffead5a87 100644
|
| --- a/cc/test/layer_tree_test.h
|
| +++ b/cc/test/layer_tree_test.h
|
| @@ -156,10 +156,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();
|
|
|
| @@ -221,6 +224,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_;
|
|
|