Chromium Code Reviews| 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/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1577 audio_renderer_mixer_manager_ = AudioRendererMixerManager::Create(); | 1577 audio_renderer_mixer_manager_ = AudioRendererMixerManager::Create(); |
| 1578 } | 1578 } |
| 1579 | 1579 |
| 1580 return audio_renderer_mixer_manager_.get(); | 1580 return audio_renderer_mixer_manager_.get(); |
| 1581 } | 1581 } |
| 1582 | 1582 |
| 1583 base::WaitableEvent* RenderThreadImpl::GetShutdownEvent() { | 1583 base::WaitableEvent* RenderThreadImpl::GetShutdownEvent() { |
| 1584 return ChildProcess::current()->GetShutDownEvent(); | 1584 return ChildProcess::current()->GetShutDownEvent(); |
| 1585 } | 1585 } |
| 1586 | 1586 |
| 1587 int32_t RenderThreadImpl::GetClientId() { | |
| 1588 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 1589 switches::kRendererClientId)) | |
|
Fady Samuel
2016/10/31 15:32:38
nit: braces here.
Alex Z.
2016/10/31 15:41:33
Done.
| |
| 1590 return 1; | |
| 1591 int client_id; | |
|
Fady Samuel
2016/10/31 15:32:38
Initialize this to 0.
Alex Z.
2016/10/31 15:41:33
Done.
| |
| 1592 base::StringToInt(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | |
| 1593 switches::kRendererClientId), | |
| 1594 &client_id); | |
| 1595 return client_id; | |
| 1596 } | |
| 1597 | |
| 1587 void RenderThreadImpl::OnAssociatedInterfaceRequest( | 1598 void RenderThreadImpl::OnAssociatedInterfaceRequest( |
| 1588 const std::string& name, | 1599 const std::string& name, |
| 1589 mojo::ScopedInterfaceEndpointHandle handle) { | 1600 mojo::ScopedInterfaceEndpointHandle handle) { |
| 1590 associated_interfaces_.BindRequest(name, std::move(handle)); | 1601 associated_interfaces_.BindRequest(name, std::move(handle)); |
| 1591 } | 1602 } |
| 1592 | 1603 |
| 1593 bool RenderThreadImpl::IsGpuRasterizationForced() { | 1604 bool RenderThreadImpl::IsGpuRasterizationForced() { |
| 1594 return is_gpu_rasterization_forced_; | 1605 return is_gpu_rasterization_forced_; |
| 1595 } | 1606 } |
| 1596 | 1607 |
| (...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2482 } | 2493 } |
| 2483 } | 2494 } |
| 2484 | 2495 |
| 2485 void RenderThreadImpl::OnRendererInterfaceRequest( | 2496 void RenderThreadImpl::OnRendererInterfaceRequest( |
| 2486 mojom::RendererAssociatedRequest request) { | 2497 mojom::RendererAssociatedRequest request) { |
| 2487 DCHECK(!renderer_binding_.is_bound()); | 2498 DCHECK(!renderer_binding_.is_bound()); |
| 2488 renderer_binding_.Bind(std::move(request)); | 2499 renderer_binding_.Bind(std::move(request)); |
| 2489 } | 2500 } |
| 2490 | 2501 |
| 2491 } // namespace content | 2502 } // namespace content |
| OLD | NEW |