| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index 6b781cb60ef6f8989577521f22ca4df5e63ead2a..b194491d7606763193f75e034c965c5b022ebeb7 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -1659,7 +1659,8 @@ class EvictionTestLayerImpl : public LayerImpl {
|
| }
|
| virtual ~EvictionTestLayerImpl() {}
|
|
|
| - virtual void AppendQuads(QuadSink* quad_sink,
|
| + virtual void AppendQuads(RenderPass* render_pass,
|
| + const OcclusionTracker<LayerImpl>& occlusion_tracker,
|
| AppendQuadsData* append_quads_data) OVERRIDE {
|
| ASSERT_TRUE(has_texture_);
|
| ASSERT_NE(0u, layer_tree_impl()->resource_provider()->num_resources());
|
| @@ -4632,7 +4633,7 @@ class LayerTreeHostTestHighResRequiredAfterEvictingUIResources
|
| };
|
|
|
| // This test is flaky, see http://crbug.com/386199
|
| -//MULTI_THREAD_TEST_F(LayerTreeHostTestHighResRequiredAfterEvictingUIResources);
|
| +// MULTI_THREAD_TEST_F(LayerTreeHostTestHighResRequiredAfterEvictingUIResources)
|
|
|
| class LayerTreeHostTestGpuRasterizationDefault : public LayerTreeHostTest {
|
| protected:
|
|
|