OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/gpu/gpu_process_host.h" | 5 #include "content/browser/gpu/gpu_process_host.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <list> | 10 #include <list> |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 } | 324 } |
325 | 325 |
326 private: | 326 private: |
327 #if defined(OS_WIN) | 327 #if defined(OS_WIN) |
328 base::CommandLine cmd_line_; | 328 base::CommandLine cmd_line_; |
329 #endif // OS_WIN | 329 #endif // OS_WIN |
330 }; | 330 }; |
331 | 331 |
332 #if defined(OS_ANDROID) | 332 #if defined(OS_ANDROID) |
333 template <typename Interface> | 333 template <typename Interface> |
334 void BindJavaInterface(mojo::InterfaceRequest<Interface> request) { | 334 void BindJavaInterface(const service_manager::BindSourceInfo& source_info, |
| 335 mojo::InterfaceRequest<Interface> request) { |
335 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 336 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
336 content::GetGlobalJavaInterfaces()->GetInterface(std::move(request)); | 337 content::GetGlobalJavaInterfaces()->GetInterface(std::move(request)); |
337 } | 338 } |
338 #endif // defined(OS_ANDROID) | 339 #endif // defined(OS_ANDROID) |
339 | 340 |
340 } // anonymous namespace | 341 } // anonymous namespace |
341 | 342 |
342 class GpuProcessHost::ConnectionFilterImpl : public ConnectionFilter { | 343 class GpuProcessHost::ConnectionFilterImpl : public ConnectionFilter { |
343 public: | 344 public: |
344 ConnectionFilterImpl() { | 345 ConnectionFilterImpl() { |
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1211 if (!cache.get()) | 1212 if (!cache.get()) |
1212 return; | 1213 return; |
1213 | 1214 |
1214 cache->set_shader_loaded_callback(base::Bind(&GpuProcessHost::LoadedShader, | 1215 cache->set_shader_loaded_callback(base::Bind(&GpuProcessHost::LoadedShader, |
1215 weak_ptr_factory_.GetWeakPtr())); | 1216 weak_ptr_factory_.GetWeakPtr())); |
1216 | 1217 |
1217 client_id_to_shader_cache_[client_id] = cache; | 1218 client_id_to_shader_cache_[client_id] = cache; |
1218 } | 1219 } |
1219 | 1220 |
1220 } // namespace content | 1221 } // namespace content |
OLD | NEW |