| 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/basictypes.h" | |
| 6 #include "base/compiler_specific.h" | 5 #include "base/compiler_specific.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" |
| 11 #include "cc/trees/proxy_main.h" | 11 #include "cc/trees/proxy_main.h" |
| 12 | 12 |
| 13 #define PROXY_MAIN_THREADED_TEST_F(TEST_FIXTURE_NAME) \ | 13 #define PROXY_MAIN_THREADED_TEST_F(TEST_FIXTURE_NAME) \ |
| 14 TEST_F(TEST_FIXTURE_NAME, MultiThread) { Run(true); } | 14 TEST_F(TEST_FIXTURE_NAME, MultiThread) { Run(true); } |
| 15 | 15 |
| 16 // Do common tests for single thread proxy and proxy main in threaded mode. | 16 // Do common tests for single thread proxy and proxy main in threaded mode. |
| (...skipping 318 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 |