Chromium Code Reviews| 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 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1208 set_offscreen_context_provider(offscreen_context_provider); | 1208 set_offscreen_context_provider(offscreen_context_provider); |
| 1209 } | 1209 } |
| 1210 } else if (offscreen_context_provider.get()) { | 1210 } else if (offscreen_context_provider.get()) { |
| 1211 offscreen_context_provider->VerifyContexts(); | 1211 offscreen_context_provider->VerifyContexts(); |
| 1212 } | 1212 } |
| 1213 } | 1213 } |
| 1214 | 1214 |
| 1215 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) { | 1215 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) { |
| 1216 TRACE_EVENT0("cc", "ThreadProxy::FinishGLOnImplThread"); | 1216 TRACE_EVENT0("cc", "ThreadProxy::FinishGLOnImplThread"); |
| 1217 DCHECK(IsImplThread()); | 1217 DCHECK(IsImplThread()); |
| 1218 if (layer_tree_host_impl_->resource_provider()) | 1218 // Can this be a flush? |
|
piman
2013/06/21 02:31:10
I think this can be a shallow finish. The idea her
| |
| 1219 layer_tree_host_impl_->resource_provider()->Finish(); | 1219 //if (layer_tree_host_impl_->resource_provider()) |
| 1220 // layer_tree_host_impl_->resource_provider()->Finish(); | |
| 1220 completion->Signal(); | 1221 completion->Signal(); |
| 1221 } | 1222 } |
| 1222 | 1223 |
| 1223 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { | 1224 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { |
| 1224 TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread"); | 1225 TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread"); |
| 1225 DCHECK(IsImplThread()); | 1226 DCHECK(IsImplThread()); |
| 1226 layer_tree_host_->DeleteContentsTexturesOnImplThread( | 1227 layer_tree_host_->DeleteContentsTexturesOnImplThread( |
| 1227 layer_tree_host_impl_->resource_provider()); | 1228 layer_tree_host_impl_->resource_provider()); |
| 1228 layer_tree_host_impl_->SetNeedsBeginFrame(false); | 1229 layer_tree_host_impl_->SetNeedsBeginFrame(false); |
| 1229 scheduler_on_impl_thread_.reset(); | 1230 scheduler_on_impl_thread_.reset(); |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1415 !layer_tree_host_impl_->pending_tree()) { | 1416 !layer_tree_host_impl_->pending_tree()) { |
| 1416 TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation", | 1417 TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation", |
| 1417 TRACE_EVENT_SCOPE_THREAD); | 1418 TRACE_EVENT_SCOPE_THREAD); |
| 1418 DCHECK(layer_tree_host_impl_->settings().impl_side_painting); | 1419 DCHECK(layer_tree_host_impl_->settings().impl_side_painting); |
| 1419 completion_event_for_commit_held_on_tree_activation_->Signal(); | 1420 completion_event_for_commit_held_on_tree_activation_->Signal(); |
| 1420 completion_event_for_commit_held_on_tree_activation_ = NULL; | 1421 completion_event_for_commit_held_on_tree_activation_ = NULL; |
| 1421 } | 1422 } |
| 1422 } | 1423 } |
| 1423 | 1424 |
| 1424 } // namespace cc | 1425 } // namespace cc |
| OLD | NEW |