| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/proxy.h" | 5 #include "cc/trees/proxy.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop_proxy.h" | 7 #include "base/message_loop/message_loop_proxy.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 | 9 |
| 10 namespace cc { | 10 namespace cc { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 impl_task_runner_(impl_task_runner), | 70 impl_task_runner_(impl_task_runner), |
| 71 impl_thread_is_overridden_(false), | 71 impl_thread_is_overridden_(false), |
| 72 is_main_thread_blocked_(false) { | 72 is_main_thread_blocked_(false) { |
| 73 #endif | 73 #endif |
| 74 } | 74 } |
| 75 | 75 |
| 76 Proxy::~Proxy() { | 76 Proxy::~Proxy() { |
| 77 DCHECK(IsMainThread()); | 77 DCHECK(IsMainThread()); |
| 78 } | 78 } |
| 79 | 79 |
| 80 scoped_ptr<base::Value> Proxy::SchedulerStateAsValueForTesting() { | 80 scoped_ptr<base::Value> Proxy::SchedulerAsValueForTesting() { |
| 81 return make_scoped_ptr(base::Value::CreateNullValue()); | 81 return make_scoped_ptr(base::Value::CreateNullValue()); |
| 82 } | 82 } |
| 83 | 83 |
| 84 } // namespace cc | 84 } // namespace cc |
| OLD | NEW |