| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 // Represents the browser side of the browser <--> renderer communication | 5 // Represents the browser side of the browser <--> renderer communication |
| 6 // channel. There will be one RenderProcessHost per renderer process. | 6 // channel. There will be one RenderProcessHost per renderer process. |
| 7 | 7 |
| 8 #include "content/browser/renderer_host/render_process_host_impl.h" | 8 #include "content/browser/renderer_host/render_process_host_impl.h" |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 | 225 |
| 226 #if defined(ENABLE_WEBRTC) | 226 #if defined(ENABLE_WEBRTC) |
| 227 #include "content/browser/media/webrtc/webrtc_internals.h" | 227 #include "content/browser/media/webrtc/webrtc_internals.h" |
| 228 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h" | 228 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h" |
| 229 #include "content/browser/renderer_host/media/webrtc_identity_service_host.h" | 229 #include "content/browser/renderer_host/media/webrtc_identity_service_host.h" |
| 230 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" | 230 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" |
| 231 #include "content/common/media/aec_dump_messages.h" | 231 #include "content/common/media/aec_dump_messages.h" |
| 232 #include "content/common/media/media_stream_messages.h" | 232 #include "content/common/media/media_stream_messages.h" |
| 233 #endif | 233 #endif |
| 234 | 234 |
| 235 #if defined(MOJO_RUNNER_CLIENT) | 235 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) |
| 236 #include "components/mus/common/switches.h" | 236 #include "components/mus/common/switches.h" // nogncheck |
| 237 #endif | 237 #endif |
| 238 | 238 |
| 239 #if defined(OS_WIN) | 239 #if defined(OS_WIN) |
| 240 #define IntToStringType base::IntToString16 | 240 #define IntToStringType base::IntToString16 |
| 241 #else | 241 #else |
| 242 #define IntToStringType base::IntToString | 242 #define IntToStringType base::IntToString |
| 243 #endif | 243 #endif |
| 244 | 244 |
| 245 namespace content { | 245 namespace content { |
| 246 namespace { | 246 namespace { |
| (...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1540 switches::kEnableWin7WebRtcHWH264Decoding, | 1540 switches::kEnableWin7WebRtcHWH264Decoding, |
| 1541 switches::kTrySupportedChannelLayouts, | 1541 switches::kTrySupportedChannelLayouts, |
| 1542 switches::kTraceExportEventsToETW, | 1542 switches::kTraceExportEventsToETW, |
| 1543 #endif | 1543 #endif |
| 1544 #if defined(USE_OZONE) | 1544 #if defined(USE_OZONE) |
| 1545 switches::kOzonePlatform, | 1545 switches::kOzonePlatform, |
| 1546 #endif | 1546 #endif |
| 1547 #if defined(OS_CHROMEOS) | 1547 #if defined(OS_CHROMEOS) |
| 1548 switches::kDisableVaapiAcceleratedVideoEncode, | 1548 switches::kDisableVaapiAcceleratedVideoEncode, |
| 1549 #endif | 1549 #endif |
| 1550 #if defined(MOJO_SHELL_CLIENT) | |
| 1551 switches::kUseMusInRenderer, | |
| 1552 #endif | |
| 1553 #if defined(ENABLE_IPC_FUZZER) | 1550 #if defined(ENABLE_IPC_FUZZER) |
| 1554 switches::kIpcDumpDirectory, | 1551 switches::kIpcDumpDirectory, |
| 1555 switches::kIpcFuzzerTestcase, | 1552 switches::kIpcFuzzerTestcase, |
| 1556 #endif | 1553 #endif |
| 1557 #if defined(MOJO_RUNNER_CLIENT) | 1554 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) |
| 1555 switches::kUseMusInRenderer, |
| 1558 mus::switches::kUseMojoGpuCommandBufferInMus, | 1556 mus::switches::kUseMojoGpuCommandBufferInMus, |
| 1559 #endif | 1557 #endif |
| 1560 }; | 1558 }; |
| 1561 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 1559 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, |
| 1562 arraysize(kSwitchNames)); | 1560 arraysize(kSwitchNames)); |
| 1563 | 1561 |
| 1564 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd); | 1562 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd); |
| 1565 | 1563 |
| 1566 if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 1564 if (browser_cmd.HasSwitch(switches::kTraceStartup) && |
| 1567 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { | 1565 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { |
| (...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2826 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; | 2824 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; |
| 2827 | 2825 |
| 2828 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias | 2826 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias |
| 2829 // enough information here so that we can determine what the bad message was. | 2827 // enough information here so that we can determine what the bad message was. |
| 2830 base::debug::Alias(&error); | 2828 base::debug::Alias(&error); |
| 2831 bad_message::ReceivedBadMessage(process.get(), | 2829 bad_message::ReceivedBadMessage(process.get(), |
| 2832 bad_message::RPH_MOJO_PROCESS_ERROR); | 2830 bad_message::RPH_MOJO_PROCESS_ERROR); |
| 2833 } | 2831 } |
| 2834 | 2832 |
| 2835 } // namespace content | 2833 } // namespace content |
| OLD | NEW |