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 // 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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1209 #if defined(OS_MACOSX) | 1209 #if defined(OS_MACOSX) |
| 1210 // Allow this to be set when invoking the browser and relayed along. | 1210 // Allow this to be set when invoking the browser and relayed along. |
| 1211 switches::kEnableSandboxLogging, | 1211 switches::kEnableSandboxLogging, |
| 1212 #endif | 1212 #endif |
| 1213 #if defined(OS_WIN) | 1213 #if defined(OS_WIN) |
| 1214 switches::kDisableDirectWrite, | 1214 switches::kDisableDirectWrite, |
| 1215 #endif | 1215 #endif |
| 1216 #if defined(OS_CHROMEOS) | 1216 #if defined(OS_CHROMEOS) |
| 1217 switches::kDisableVaapiAcceleratedVideoEncode, | 1217 switches::kDisableVaapiAcceleratedVideoEncode, |
| 1218 #endif | 1218 #endif |
| 1219 switches::kDisableSVG1DOM, | |
|
jam
2014/09/19 18:44:28
put this before the ifdef sections start, sorted
| |
| 1219 }; | 1220 }; |
| 1220 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 1221 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, |
| 1221 arraysize(kSwitchNames)); | 1222 arraysize(kSwitchNames)); |
| 1222 | 1223 |
| 1223 if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 1224 if (browser_cmd.HasSwitch(switches::kTraceStartup) && |
| 1224 BrowserMainLoop::GetInstance()->is_tracing_startup()) { | 1225 BrowserMainLoop::GetInstance()->is_tracing_startup()) { |
| 1225 // Pass kTraceStartup switch to renderer only if startup tracing has not | 1226 // Pass kTraceStartup switch to renderer only if startup tracing has not |
| 1226 // finished. | 1227 // finished. |
| 1227 renderer_cmd->AppendSwitchASCII( | 1228 renderer_cmd->AppendSwitchASCII( |
| 1228 switches::kTraceStartup, | 1229 switches::kTraceStartup, |
| (...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2203 | 2204 |
| 2204 void RenderProcessHostImpl::DecrementWorkerRefCount() { | 2205 void RenderProcessHostImpl::DecrementWorkerRefCount() { |
| 2205 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 2206 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 2206 DCHECK_GT(worker_ref_count_, 0); | 2207 DCHECK_GT(worker_ref_count_, 0); |
| 2207 --worker_ref_count_; | 2208 --worker_ref_count_; |
| 2208 if (worker_ref_count_ == 0) | 2209 if (worker_ref_count_ == 0) |
| 2209 Cleanup(); | 2210 Cleanup(); |
| 2210 } | 2211 } |
| 2211 | 2212 |
| 2212 } // namespace content | 2213 } // namespace content |
| OLD | NEW |