Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 11567023: Merge 168111 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/audio/audio_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 } 704 }
705 705
706 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( 706 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
707 const CommandLine& browser_cmd, 707 const CommandLine& browser_cmd,
708 CommandLine* renderer_cmd) const { 708 CommandLine* renderer_cmd) const {
709 // Propagate the following switches to the renderer command line (along 709 // Propagate the following switches to the renderer command line (along
710 // with any associated values) if present in the browser command line. 710 // with any associated values) if present in the browser command line.
711 static const char* const kSwitchNames[] = { 711 static const char* const kSwitchNames[] = {
712 // We propagate the Chrome Frame command line here as well in case the 712 // We propagate the Chrome Frame command line here as well in case the
713 // renderer is not run in the sandbox. 713 // renderer is not run in the sandbox.
714 switches::kAudioBufferSize,
714 switches::kAuditAllHandles, 715 switches::kAuditAllHandles,
715 switches::kAuditHandles, 716 switches::kAuditHandles,
716 switches::kChromeFrame, 717 switches::kChromeFrame,
717 switches::kDisable3DAPIs, 718 switches::kDisable3DAPIs,
718 switches::kDisableAcceleratedCompositing, 719 switches::kDisableAcceleratedCompositing,
719 switches::kDisableAcceleratedVideoDecode, 720 switches::kDisableAcceleratedVideoDecode,
720 switches::kDisableApplicationCache, 721 switches::kDisableApplicationCache,
721 switches::kDisableAudio, 722 switches::kDisableAudio,
722 switches::kDisableAudioOutputResampler, 723 switches::kDisableAudioOutputResampler,
723 switches::kDisableBreakpad, 724 switches::kDisableBreakpad,
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
1560 int32 gpu_process_host_id) { 1561 int32 gpu_process_host_id) {
1561 TRACE_EVENT0("renderer_host", 1562 TRACE_EVENT0("renderer_host",
1562 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1563 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1563 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1564 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1564 gpu_process_host_id, 1565 gpu_process_host_id,
1565 false, 1566 false,
1566 0); 1567 0);
1567 } 1568 }
1568 1569
1569 } // namespace content 1570 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/audio/audio_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698