| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "base/location.h" | 7 #include "base/location.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 2054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2065 void AfterTest() override {} | 2065 void AfterTest() override {} |
| 2066 | 2066 |
| 2067 private: | 2067 private: |
| 2068 gfx::ScrollOffset initial_scroll_; | 2068 gfx::ScrollOffset initial_scroll_; |
| 2069 gfx::ScrollOffset second_scroll_; | 2069 gfx::ScrollOffset second_scroll_; |
| 2070 gfx::Vector2dF scroll_amount_; | 2070 gfx::Vector2dF scroll_amount_; |
| 2071 }; | 2071 }; |
| 2072 | 2072 |
| 2073 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostScrollTestPropertyTreeUpdate); | 2073 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostScrollTestPropertyTreeUpdate); |
| 2074 | 2074 |
| 2075 // Disabled due to flakes/crashes on Linux TSan Tests and on | 2075 // Disabled due to flakes/crashes on Linux TSan Tests, linux_chromium_asan_rel |
| 2076 // linux_chromium_asan_rel; see https://crbug.com/697652. | 2076 // and Android N5X Swarm; see https://crbug.com/697652. |
| 2077 #if defined(OS_LINUX) | 2077 #if defined(OS_LINUX) || defined(OS_ANDROID) |
| 2078 #define MAYBE_LayerTreeHostScrollTestImplSideInvalidation \ | 2078 #define MAYBE_LayerTreeHostScrollTestImplSideInvalidation \ |
| 2079 DISABLED_LayerTreeHostScrollTestImplSideInvalidation | 2079 DISABLED_LayerTreeHostScrollTestImplSideInvalidation |
| 2080 #else | 2080 #else |
| 2081 #define MAYBE_LayerTreeHostScrollTestImplSideInvalidation \ | 2081 #define MAYBE_LayerTreeHostScrollTestImplSideInvalidation \ |
| 2082 LayerTreeHostScrollTestImplSideInvalidation | 2082 LayerTreeHostScrollTestImplSideInvalidation |
| 2083 #endif | 2083 #endif |
| 2084 class MAYBE_LayerTreeHostScrollTestImplSideInvalidation | 2084 class MAYBE_LayerTreeHostScrollTestImplSideInvalidation |
| 2085 : public LayerTreeHostScrollTest { | 2085 : public LayerTreeHostScrollTest { |
| 2086 void BeginTest() override { | 2086 void BeginTest() override { |
| 2087 layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback( | 2087 layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback( |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2246 CompletionEvent* impl_side_invalidation_event_ = nullptr; | 2246 CompletionEvent* impl_side_invalidation_event_ = nullptr; |
| 2247 | 2247 |
| 2248 // Main thread. | 2248 // Main thread. |
| 2249 int num_of_deltas_ = 0; | 2249 int num_of_deltas_ = 0; |
| 2250 }; | 2250 }; |
| 2251 | 2251 |
| 2252 MULTI_THREAD_TEST_F(MAYBE_LayerTreeHostScrollTestImplSideInvalidation); | 2252 MULTI_THREAD_TEST_F(MAYBE_LayerTreeHostScrollTestImplSideInvalidation); |
| 2253 | 2253 |
| 2254 } // namespace | 2254 } // namespace |
| 2255 } // namespace cc | 2255 } // namespace cc |
| OLD | NEW |