OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/common/gpu/client/context_provider_command_buffer.h" | 5 #include "content/common/gpu/client/context_provider_command_buffer.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 | 100 |
101 WebContext3DNoChecks()->SetContextType(context_type_); | 101 WebContext3DNoChecks()->SetContextType(context_type_); |
102 if (!WebContext3DNoChecks()->InitializeOnCurrentThread()) | 102 if (!WebContext3DNoChecks()->InitializeOnCurrentThread()) |
103 return false; | 103 return false; |
104 | 104 |
105 gr_interface_->BindToCurrentThread(); | 105 gr_interface_->BindToCurrentThread(); |
106 InitializeCapabilities(); | 106 InitializeCapabilities(); |
107 | 107 |
108 std::string unique_context_name = | 108 std::string unique_context_name = |
109 base::StringPrintf("%s-%p", debug_name_.c_str(), WebContext3DNoChecks()); | 109 base::StringPrintf("%s-%p", debug_name_.c_str(), WebContext3DNoChecks()); |
110 WebContext3DNoChecks()->traceBeginCHROMIUM("gpu_toplevel", | 110 WebContext3DNoChecks()->GetImplementation()->TraceBeginCHROMIUM( |
111 unique_context_name.c_str()); | 111 "gpu_toplevel", unique_context_name.c_str()); |
112 | 112 |
113 lost_context_callback_proxy_.reset(new LostContextCallbackProxy(this)); | 113 lost_context_callback_proxy_.reset(new LostContextCallbackProxy(this)); |
114 return true; | 114 return true; |
115 } | 115 } |
116 | 116 |
117 void ContextProviderCommandBuffer::DetachFromThread() { | 117 void ContextProviderCommandBuffer::DetachFromThread() { |
118 context_thread_checker_.DetachFromThread(); | 118 context_thread_checker_.DetachFromThread(); |
119 } | 119 } |
120 | 120 |
121 gpu::gles2::GLES2Interface* ContextProviderCommandBuffer::ContextGL() { | 121 gpu::gles2::GLES2Interface* ContextProviderCommandBuffer::ContextGL() { |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 | 199 |
200 void ContextProviderCommandBuffer::SetLostContextCallback( | 200 void ContextProviderCommandBuffer::SetLostContextCallback( |
201 const LostContextCallback& lost_context_callback) { | 201 const LostContextCallback& lost_context_callback) { |
202 DCHECK(context_thread_checker_.CalledOnValidThread()); | 202 DCHECK(context_thread_checker_.CalledOnValidThread()); |
203 DCHECK(lost_context_callback_.is_null() || | 203 DCHECK(lost_context_callback_.is_null() || |
204 lost_context_callback.is_null()); | 204 lost_context_callback.is_null()); |
205 lost_context_callback_ = lost_context_callback; | 205 lost_context_callback_ = lost_context_callback; |
206 } | 206 } |
207 | 207 |
208 } // namespace content | 208 } // namespace content |
OLD | NEW |