| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "cc/test/fake_content_layer_client.h" | 7 #include "cc/test/fake_content_layer_client.h" |
| 8 #include "cc/test/fake_picture_layer.h" | 8 #include "cc/test/fake_picture_layer.h" |
| 9 #include "cc/test/fake_picture_layer_impl.h" | 9 #include "cc/test/fake_picture_layer_impl.h" |
| 10 #include "cc/test/layer_tree_test.h" | 10 #include "cc/test/layer_tree_test.h" |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 FakeContentLayerClient client_; | 558 FakeContentLayerClient client_; |
| 559 scoped_refptr<Layer> pinch_; | 559 scoped_refptr<Layer> pinch_; |
| 560 scoped_refptr<FakePictureLayer> picture_; | 560 scoped_refptr<FakePictureLayer> picture_; |
| 561 int frame_; | 561 int frame_; |
| 562 int draws_in_frame_; | 562 int draws_in_frame_; |
| 563 int last_frame_drawn_; | 563 int last_frame_drawn_; |
| 564 }; | 564 }; |
| 565 | 565 |
| 566 // Multi-thread only because in single thread you can't pinch zoom on the | 566 // Multi-thread only because in single thread you can't pinch zoom on the |
| 567 // compositor thread. | 567 // compositor thread. |
| 568 MULTI_THREAD_IMPL_TEST_F(LayerTreeHostPictureTestRSLLMembershipWithScale); | 568 // Disabled due to flakiness. See http://crbug.com/460581 |
| 569 // MULTI_THREAD_IMPL_TEST_F(LayerTreeHostPictureTestRSLLMembershipWithScale); |
| 569 | 570 |
| 570 } // namespace | 571 } // namespace |
| 571 } // namespace cc | 572 } // namespace cc |
| OLD | NEW |