Chromium Code Reviews| 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 1858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1869 #if defined(USE_OZONE) | 1869 #if defined(USE_OZONE) |
| 1870 switches::kOzonePlatform, | 1870 switches::kOzonePlatform, |
| 1871 #endif | 1871 #endif |
| 1872 #if defined(OS_CHROMEOS) | 1872 #if defined(OS_CHROMEOS) |
| 1873 switches::kDisableVaapiAcceleratedVideoEncode, | 1873 switches::kDisableVaapiAcceleratedVideoEncode, |
| 1874 #endif | 1874 #endif |
| 1875 #if defined(ENABLE_IPC_FUZZER) | 1875 #if defined(ENABLE_IPC_FUZZER) |
| 1876 switches::kIpcDumpDirectory, | 1876 switches::kIpcDumpDirectory, |
| 1877 switches::kIpcFuzzerTestcase, | 1877 switches::kIpcFuzzerTestcase, |
| 1878 #endif | 1878 #endif |
| 1879 switches::kUseMusInRenderer, | 1879 switches::kNoUseMusInRenderer, |
|
jam
2017/01/31 16:06:50
nit: pattern here is to put switches not in ifdef
sadrul
2017/01/31 17:01:04
Done.
| |
| 1880 }; | 1880 }; |
| 1881 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 1881 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, |
| 1882 arraysize(kSwitchNames)); | 1882 arraysize(kSwitchNames)); |
| 1883 | 1883 |
| 1884 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd); | 1884 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd); |
| 1885 | 1885 |
| 1886 if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 1886 if (browser_cmd.HasSwitch(switches::kTraceStartup) && |
| 1887 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { | 1887 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { |
| 1888 // Pass kTraceStartup switch to renderer only if startup tracing has not | 1888 // Pass kTraceStartup switch to renderer only if startup tracing has not |
| 1889 // finished. | 1889 // finished. |
| (...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3056 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; | 3056 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; |
| 3057 | 3057 |
| 3058 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. | 3058 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. |
| 3059 // Capture the error message in a crash key value. | 3059 // Capture the error message in a crash key value. |
| 3060 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); | 3060 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); |
| 3061 bad_message::ReceivedBadMessage(render_process_id, | 3061 bad_message::ReceivedBadMessage(render_process_id, |
| 3062 bad_message::RPH_MOJO_PROCESS_ERROR); | 3062 bad_message::RPH_MOJO_PROCESS_ERROR); |
| 3063 } | 3063 } |
| 3064 | 3064 |
| 3065 } // namespace content | 3065 } // namespace content |
| OLD | NEW |