| 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/thread_proxy.h" | 5 #include "cc/trees/thread_proxy.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1169 TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread"); | 1169 TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread"); |
| 1170 DCHECK(IsImplThread()); | 1170 DCHECK(IsImplThread()); |
| 1171 layer_tree_host_impl_ = layer_tree_host_->CreateLayerTreeHostImpl(this); | 1171 layer_tree_host_impl_ = layer_tree_host_->CreateLayerTreeHostImpl(this); |
| 1172 const LayerTreeSettings& settings = layer_tree_host_->settings(); | 1172 const LayerTreeSettings& settings = layer_tree_host_->settings(); |
| 1173 SchedulerSettings scheduler_settings; | 1173 SchedulerSettings scheduler_settings; |
| 1174 scheduler_settings.impl_side_painting = settings.impl_side_painting; | 1174 scheduler_settings.impl_side_painting = settings.impl_side_painting; |
| 1175 scheduler_settings.timeout_and_draw_when_animation_checkerboards = | 1175 scheduler_settings.timeout_and_draw_when_animation_checkerboards = |
| 1176 settings.timeout_and_draw_when_animation_checkerboards; | 1176 settings.timeout_and_draw_when_animation_checkerboards; |
| 1177 scheduler_settings.using_synchronous_renderer_compositor = | 1177 scheduler_settings.using_synchronous_renderer_compositor = |
| 1178 settings.using_synchronous_renderer_compositor; | 1178 settings.using_synchronous_renderer_compositor; |
| 1179 scheduler_settings.throttle_frame_production = |
| 1180 settings.throttle_frame_production; |
| 1179 scheduler_on_impl_thread_ = Scheduler::Create(this, scheduler_settings); | 1181 scheduler_on_impl_thread_ = Scheduler::Create(this, scheduler_settings); |
| 1180 scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible()); | 1182 scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible()); |
| 1181 | 1183 |
| 1182 impl_thread_weak_ptr_ = weak_factory_on_impl_thread_.GetWeakPtr(); | 1184 impl_thread_weak_ptr_ = weak_factory_on_impl_thread_.GetWeakPtr(); |
| 1183 completion->Signal(); | 1185 completion->Signal(); |
| 1184 } | 1186 } |
| 1185 | 1187 |
| 1186 void ThreadProxy::InitializeOutputSurfaceOnImplThread( | 1188 void ThreadProxy::InitializeOutputSurfaceOnImplThread( |
| 1187 CompletionEvent* completion, | 1189 CompletionEvent* completion, |
| 1188 scoped_ptr<OutputSurface> output_surface, | 1190 scoped_ptr<OutputSurface> output_surface, |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1437 !layer_tree_host_impl_->pending_tree()) { | 1439 !layer_tree_host_impl_->pending_tree()) { |
| 1438 TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation", | 1440 TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation", |
| 1439 TRACE_EVENT_SCOPE_THREAD); | 1441 TRACE_EVENT_SCOPE_THREAD); |
| 1440 DCHECK(layer_tree_host_impl_->settings().impl_side_painting); | 1442 DCHECK(layer_tree_host_impl_->settings().impl_side_painting); |
| 1441 completion_event_for_commit_held_on_tree_activation_->Signal(); | 1443 completion_event_for_commit_held_on_tree_activation_->Signal(); |
| 1442 completion_event_for_commit_held_on_tree_activation_ = NULL; | 1444 completion_event_for_commit_held_on_tree_activation_ = NULL; |
| 1443 } | 1445 } |
| 1444 } | 1446 } |
| 1445 | 1447 |
| 1446 } // namespace cc | 1448 } // namespace cc |
| OLD | NEW |