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 <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1260 capabilities)); | 1260 capabilities)); |
| 1261 | 1261 |
| 1262 if (success) | 1262 if (success) |
| 1263 impl().scheduler->DidCreateAndInitializeOutputSurface(); | 1263 impl().scheduler->DidCreateAndInitializeOutputSurface(); |
| 1264 } | 1264 } |
| 1265 | 1265 |
| 1266 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) { | 1266 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) { |
| 1267 TRACE_EVENT0("cc", "ThreadProxy::FinishGLOnImplThread"); | 1267 TRACE_EVENT0("cc", "ThreadProxy::FinishGLOnImplThread"); |
| 1268 DCHECK(IsImplThread()); | 1268 DCHECK(IsImplThread()); |
| 1269 if (impl().layer_tree_host_impl->resource_provider()) | 1269 if (impl().layer_tree_host_impl->resource_provider()) |
| 1270 impl().layer_tree_host_impl->resource_provider()->Finish(); | 1270 impl() |
|
danakj
2014/07/09 16:01:33
can we just call Finish() on the GL context direct
sohanjg
2014/07/10 15:11:06
Done.
| |
| 1271 .layer_tree_host_impl->resource_provider() | |
| 1272 ->GetResourceHelper() | |
| 1273 ->Finish(); | |
| 1271 completion->Signal(); | 1274 completion->Signal(); |
| 1272 } | 1275 } |
| 1273 | 1276 |
| 1274 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { | 1277 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { |
| 1275 TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread"); | 1278 TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread"); |
| 1276 DCHECK(IsImplThread()); | 1279 DCHECK(IsImplThread()); |
| 1277 DCHECK(IsMainThreadBlocked()); | 1280 DCHECK(IsMainThreadBlocked()); |
| 1278 layer_tree_host()->DeleteContentsTexturesOnImplThread( | 1281 layer_tree_host()->DeleteContentsTexturesOnImplThread( |
| 1279 impl().layer_tree_host_impl->resource_provider()); | 1282 impl().layer_tree_host_impl->resource_provider()); |
| 1280 impl().current_resource_update_controller.reset(); | 1283 impl().current_resource_update_controller.reset(); |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1439 | 1442 |
| 1440 impl().timing_history.DidActivatePendingTree(); | 1443 impl().timing_history.DidActivatePendingTree(); |
| 1441 } | 1444 } |
| 1442 | 1445 |
| 1443 void ThreadProxy::DidManageTiles() { | 1446 void ThreadProxy::DidManageTiles() { |
| 1444 DCHECK(IsImplThread()); | 1447 DCHECK(IsImplThread()); |
| 1445 impl().scheduler->DidManageTiles(); | 1448 impl().scheduler->DidManageTiles(); |
| 1446 } | 1449 } |
| 1447 | 1450 |
| 1448 } // namespace cc | 1451 } // namespace cc |
| OLD | NEW |