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 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1228 capabilities)); | 1228 capabilities)); |
| 1229 | 1229 |
| 1230 if (success) | 1230 if (success) |
| 1231 impl().scheduler->DidCreateAndInitializeOutputSurface(); | 1231 impl().scheduler->DidCreateAndInitializeOutputSurface(); |
| 1232 } | 1232 } |
| 1233 | 1233 |
| 1234 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) { | 1234 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) { |
| 1235 TRACE_EVENT0("cc", "ThreadProxy::FinishGLOnImplThread"); | 1235 TRACE_EVENT0("cc", "ThreadProxy::FinishGLOnImplThread"); |
| 1236 DCHECK(IsImplThread()); | 1236 DCHECK(IsImplThread()); |
| 1237 if (impl().layer_tree_host_impl->output_surface()) { | 1237 if (impl().layer_tree_host_impl->output_surface()) { |
| 1238 ContextProvider* context_provider = | 1238 scoped_refptr<ContextProvider> context_provider = |
|
danakj
2014/08/25 20:25:01
can you just use .get() here? there's no need to t
dcheng
2014/08/25 20:56:58
Done (this was converted for the same reason).
| |
| 1239 impl().layer_tree_host_impl->output_surface()->context_provider(); | 1239 impl().layer_tree_host_impl->output_surface()->context_provider(); |
| 1240 if (context_provider) | 1240 if (context_provider) |
| 1241 context_provider->ContextGL()->Finish(); | 1241 context_provider->ContextGL()->Finish(); |
| 1242 } | 1242 } |
| 1243 completion->Signal(); | 1243 completion->Signal(); |
| 1244 } | 1244 } |
| 1245 | 1245 |
| 1246 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { | 1246 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { |
| 1247 TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread"); | 1247 TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread"); |
| 1248 DCHECK(IsImplThread()); | 1248 DCHECK(IsImplThread()); |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1390 | 1390 |
| 1391 impl().timing_history.DidActivateSyncTree(); | 1391 impl().timing_history.DidActivateSyncTree(); |
| 1392 } | 1392 } |
| 1393 | 1393 |
| 1394 void ThreadProxy::DidManageTiles() { | 1394 void ThreadProxy::DidManageTiles() { |
| 1395 DCHECK(IsImplThread()); | 1395 DCHECK(IsImplThread()); |
| 1396 impl().scheduler->DidManageTiles(); | 1396 impl().scheduler->DidManageTiles(); |
| 1397 } | 1397 } |
| 1398 | 1398 |
| 1399 } // namespace cc | 1399 } // namespace cc |
| OLD | NEW |