| 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/single_thread_proxy.h" | 5 #include "cc/trees/single_thread_proxy.h" | 
| 6 | 6 | 
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" | 
| 8 #include "base/profiler/scoped_tracker.h" | 8 #include "base/profiler/scoped_tracker.h" | 
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" | 
| 10 #include "cc/debug/benchmark_instrumentation.h" | 10 #include "cc/debug/benchmark_instrumentation.h" | 
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 143   DCHECK(Proxy::IsMainThread()); | 143   DCHECK(Proxy::IsMainThread()); | 
| 144   DCHECK(layer_tree_host_->output_surface_lost()); | 144   DCHECK(layer_tree_host_->output_surface_lost()); | 
| 145   output_surface_creation_callback_.Cancel(); | 145   output_surface_creation_callback_.Cancel(); | 
| 146   if (output_surface_creation_requested_) | 146   if (output_surface_creation_requested_) | 
| 147     return; | 147     return; | 
| 148   output_surface_creation_requested_ = true; | 148   output_surface_creation_requested_ = true; | 
| 149   layer_tree_host_->RequestNewOutputSurface(); | 149   layer_tree_host_->RequestNewOutputSurface(); | 
| 150 } | 150 } | 
| 151 | 151 | 
| 152 scoped_ptr<OutputSurface> SingleThreadProxy::ReleaseOutputSurface() { | 152 scoped_ptr<OutputSurface> SingleThreadProxy::ReleaseOutputSurface() { | 
|  | 153   // |layer_tree_host_| should already be aware of this. | 
|  | 154   DCHECK(layer_tree_host_->output_surface_lost()); | 
|  | 155 | 
| 153   if (scheduler_on_impl_thread_) | 156   if (scheduler_on_impl_thread_) | 
| 154     scheduler_on_impl_thread_->DidLoseOutputSurface(); | 157     scheduler_on_impl_thread_->DidLoseOutputSurface(); | 
| 155   return layer_tree_host_impl_->ReleaseOutputSurface(); | 158   return layer_tree_host_impl_->ReleaseOutputSurface(); | 
| 156 } | 159 } | 
| 157 | 160 | 
| 158 void SingleThreadProxy::SetOutputSurface( | 161 void SingleThreadProxy::SetOutputSurface( | 
| 159     scoped_ptr<OutputSurface> output_surface) { | 162     scoped_ptr<OutputSurface> output_surface) { | 
| 160   DCHECK(Proxy::IsMainThread()); | 163   DCHECK(Proxy::IsMainThread()); | 
| 161   DCHECK(layer_tree_host_->output_surface_lost()); | 164   DCHECK(layer_tree_host_->output_surface_lost()); | 
| 162   DCHECK(output_surface_creation_requested_); | 165   DCHECK(output_surface_creation_requested_); | 
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 908       << "DidFinishImplFrame called while not inside an impl frame!"; | 911       << "DidFinishImplFrame called while not inside an impl frame!"; | 
| 909   inside_impl_frame_ = false; | 912   inside_impl_frame_ = false; | 
| 910 #endif | 913 #endif | 
| 911 } | 914 } | 
| 912 | 915 | 
| 913 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) { | 916 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) { | 
| 914   layer_tree_host_->SendBeginFramesToChildren(args); | 917   layer_tree_host_->SendBeginFramesToChildren(args); | 
| 915 } | 918 } | 
| 916 | 919 | 
| 917 }  // namespace cc | 920 }  // namespace cc | 
| OLD | NEW | 
|---|