| 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 <stddef.h> |
| 8 |
| 7 #include <algorithm> | 9 #include <algorithm> |
| 8 | 10 |
| 9 #include "base/bind.h" | 11 #include "base/bind.h" |
| 10 #include "base/location.h" | 12 #include "base/location.h" |
| 11 #include "base/synchronization/lock.h" | 13 #include "base/synchronization/lock.h" |
| 12 #include "base/synchronization/waitable_event.h" | 14 #include "base/synchronization/waitable_event.h" |
| 13 #include "base/threading/thread.h" | 15 #include "base/threading/thread.h" |
| 14 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 15 #include "cc/layers/delegated_frame_provider.h" | 17 #include "cc/layers/delegated_frame_provider.h" |
| 16 #include "cc/layers/delegated_frame_resource_collection.h" | 18 #include "cc/layers/delegated_frame_resource_collection.h" |
| (...skipping 2246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2263 } | 2265 } |
| 2264 | 2266 |
| 2265 bool drew_with_pending_tree_; | 2267 bool drew_with_pending_tree_; |
| 2266 }; | 2268 }; |
| 2267 | 2269 |
| 2268 // This test blocks activation which is not supported for single thread mode. | 2270 // This test blocks activation which is not supported for single thread mode. |
| 2269 MULTI_THREAD_BLOCKNOTIFY_TEST_F(LayerTreeHostDelegatedTestActiveFrameIsValid); | 2271 MULTI_THREAD_BLOCKNOTIFY_TEST_F(LayerTreeHostDelegatedTestActiveFrameIsValid); |
| 2270 | 2272 |
| 2271 } // namespace | 2273 } // namespace |
| 2272 } // namespace cc | 2274 } // namespace cc |
| OLD | NEW |