| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 main_thread_id_(base::PlatformThread::CurrentId()), | 76 main_thread_id_(base::PlatformThread::CurrentId()), |
| 77 impl_thread_is_overridden_(false), | 77 impl_thread_is_overridden_(false), |
| 78 is_main_thread_blocked_(false) { | 78 is_main_thread_blocked_(false) { |
| 79 #endif | 79 #endif |
| 80 } | 80 } |
| 81 | 81 |
| 82 Proxy::~Proxy() { | 82 Proxy::~Proxy() { |
| 83 DCHECK(IsMainThread()); | 83 DCHECK(IsMainThread()); |
| 84 } | 84 } |
| 85 | 85 |
| 86 scoped_ptr<base::Value> Proxy::SchedulerAsValueForTesting() { | |
| 87 return make_scoped_ptr(base::Value::CreateNullValue()); | |
| 88 } | |
| 89 | |
| 90 } // namespace cc | 86 } // namespace cc |
| OLD | NEW |