| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 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/layer_tree_test.h" | 9 #include "cc/test/layer_tree_test.h" |
| 10 #include "cc/trees/proxy_impl.h" | 10 #include "cc/trees/proxy_impl.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 class ProxyTest : public LayerTreeTest { | 23 class ProxyTest : public LayerTreeTest { |
| 24 protected: | 24 protected: |
| 25 ProxyTest() {} | 25 ProxyTest() {} |
| 26 ~ProxyTest() override {} | 26 ~ProxyTest() override {} |
| 27 | 27 |
| 28 void Run(bool threaded) { | 28 void Run(bool threaded) { |
| 29 // We don't need to care about delegating mode. | 29 // We don't need to care about delegating mode. |
| 30 bool delegating_renderer = true; | 30 bool delegating_renderer = true; |
| 31 | 31 |
| 32 CompositorMode mode = | 32 CompositorMode mode = |
| 33 threaded ? CompositorMode::Threaded : CompositorMode::SingleThreaded; | 33 threaded ? CompositorMode::THREADED : CompositorMode::SINGLE_THREADED; |
| 34 RunTest(mode, delegating_renderer); | 34 RunTest(mode, delegating_renderer); |
| 35 } | 35 } |
| 36 | 36 |
| 37 void BeginTest() override {} | 37 void BeginTest() override {} |
| 38 void AfterTest() override {} | 38 void AfterTest() override {} |
| 39 | 39 |
| 40 private: | 40 private: |
| 41 DISALLOW_COPY_AND_ASSIGN(ProxyTest); | 41 DISALLOW_COPY_AND_ASSIGN(ProxyTest); |
| 42 }; | 42 }; |
| 43 | 43 |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 | 335 |
| 336 private: | 336 private: |
| 337 int commits_completed_; | 337 int commits_completed_; |
| 338 | 338 |
| 339 DISALLOW_COPY_AND_ASSIGN(ProxyMainThreadedCommitWaitsForActivation); | 339 DISALLOW_COPY_AND_ASSIGN(ProxyMainThreadedCommitWaitsForActivation); |
| 340 }; | 340 }; |
| 341 | 341 |
| 342 PROXY_MAIN_THREADED_TEST_F(ProxyMainThreadedCommitWaitsForActivation); | 342 PROXY_MAIN_THREADED_TEST_F(ProxyMainThreadedCommitWaitsForActivation); |
| 343 | 343 |
| 344 } // namespace cc | 344 } // namespace cc |
| OLD | NEW |