aw: Ubercomp mega patch

cc/trees/proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/proxy.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
 
 namespace cc {
 
 base::SingleThreadTaskRunner* Proxy::MainThreadTaskRunner() const {
   return main_task_runner_.get();
 }
 
 bool Proxy::HasImplThread() const { return !!impl_task_runner_.get(); }
 
 base::SingleThreadTaskRunner* Proxy::ImplThreadTaskRunner() const {
   return impl_task_runner_.get();
 }
 
 bool Proxy::IsMainThread() const {
+/*
 #if DCHECK_IS_ON
   DCHECK(main_task_runner_.get());
   if (impl_thread_is_overridden_)
     return false;
   return main_task_runner_->BelongsToCurrentThread();
 #else
+*/
   return true;
-#endif
+// #endif
 }
 
 bool Proxy::IsImplThread() const {
 #if DCHECK_IS_ON
   if (impl_thread_is_overridden_)
     return true;
   if (!impl_task_runner_.get())
     return false;
   return impl_task_runner_->BelongsToCurrentThread();
 #else
@@ skipping 34 matching lines @@
 
 Proxy::~Proxy() {
   DCHECK(IsMainThread());
 }
 
 scoped_ptr<base::Value> Proxy::SchedulerAsValueForTesting() {
   return make_scoped_ptr(base::Value::CreateNullValue());
 }
 
 }  // namespace cc