| 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 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1223 switches::kMediaDrmEnableNonCompositing, | 1223 switches::kMediaDrmEnableNonCompositing, |
| 1224 switches::kNetworkCountryIso, | 1224 switches::kNetworkCountryIso, |
| 1225 switches::kDisableWebAudio, | 1225 switches::kDisableWebAudio, |
| 1226 #endif | 1226 #endif |
| 1227 #if defined(OS_MACOSX) | 1227 #if defined(OS_MACOSX) |
| 1228 // Allow this to be set when invoking the browser and relayed along. | 1228 // Allow this to be set when invoking the browser and relayed along. |
| 1229 switches::kEnableSandboxLogging, | 1229 switches::kEnableSandboxLogging, |
| 1230 #endif | 1230 #endif |
| 1231 #if defined(OS_WIN) | 1231 #if defined(OS_WIN) |
| 1232 switches::kDisableDirectWrite, | 1232 switches::kDisableDirectWrite, |
| 1233 switches::kEnableHighResolutionTime, | |
| 1234 #endif | 1233 #endif |
| 1235 #if defined(OS_CHROMEOS) | 1234 #if defined(OS_CHROMEOS) |
| 1236 switches::kEnableVaapiAcceleratedVideoEncode, | 1235 switches::kEnableVaapiAcceleratedVideoEncode, |
| 1237 #endif | 1236 #endif |
| 1238 }; | 1237 }; |
| 1239 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 1238 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, |
| 1240 arraysize(kSwitchNames)); | 1239 arraysize(kSwitchNames)); |
| 1241 | 1240 |
| 1242 if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 1241 if (browser_cmd.HasSwitch(switches::kTraceStartup) && |
| 1243 BrowserMainLoop::GetInstance()->is_tracing_startup()) { | 1242 BrowserMainLoop::GetInstance()->is_tracing_startup()) { |
| (...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2325 } | 2324 } |
| 2326 | 2325 |
| 2327 void RenderProcessHostImpl::OnDeletedGpuMemoryBuffer( | 2326 void RenderProcessHostImpl::OnDeletedGpuMemoryBuffer( |
| 2328 gfx::GpuMemoryBufferType type, | 2327 gfx::GpuMemoryBufferType type, |
| 2329 const gfx::GpuMemoryBufferId& id) { | 2328 const gfx::GpuMemoryBufferId& id) { |
| 2330 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 2329 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 2331 GpuMemoryBufferImpl::DeletedByChildProcess(type, id, GetHandle()); | 2330 GpuMemoryBufferImpl::DeletedByChildProcess(type, id, GetHandle()); |
| 2332 } | 2331 } |
| 2333 | 2332 |
| 2334 } // namespace content | 2333 } // namespace content |
| OLD | NEW |