| 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 #if defined(OS_WIN) | 10 #if defined(OS_WIN) |
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 810 switches::kForceDeviceScaleFactor, | 810 switches::kForceDeviceScaleFactor, |
| 811 switches::kFullMemoryCrashReport, | 811 switches::kFullMemoryCrashReport, |
| 812 #if !defined (GOOGLE_CHROME_BUILD) | 812 #if !defined (GOOGLE_CHROME_BUILD) |
| 813 // These are unsupported and not fully tested modes, so don't enable them | 813 // These are unsupported and not fully tested modes, so don't enable them |
| 814 // for official Google Chrome builds. | 814 // for official Google Chrome builds. |
| 815 switches::kInProcessPlugins, | 815 switches::kInProcessPlugins, |
| 816 #endif // GOOGLE_CHROME_BUILD | 816 #endif // GOOGLE_CHROME_BUILD |
| 817 switches::kInProcessWebGL, | 817 switches::kInProcessWebGL, |
| 818 switches::kJavaScriptFlags, | 818 switches::kJavaScriptFlags, |
| 819 switches::kLoggingLevel, | 819 switches::kLoggingLevel, |
| 820 switches::kOldCheckboxStyle, | |
| 821 #if defined(OS_ANDROID) | 820 #if defined(OS_ANDROID) |
| 821 switches::kMediaPlayerInRenderProcess, |
| 822 switches::kNetworkCountryIso, | 822 switches::kNetworkCountryIso, |
| 823 #endif | 823 #endif |
| 824 switches::kNoReferrers, | 824 switches::kNoReferrers, |
| 825 switches::kNoSandbox, | 825 switches::kNoSandbox, |
| 826 switches::kOldCheckboxStyle, |
| 826 switches::kPpapiOutOfProcess, | 827 switches::kPpapiOutOfProcess, |
| 827 switches::kRegisterPepperPlugins, | 828 switches::kRegisterPepperPlugins, |
| 828 switches::kRendererAssertTest, | 829 switches::kRendererAssertTest, |
| 829 #if defined(OS_POSIX) | 830 #if defined(OS_POSIX) |
| 830 switches::kChildCleanExit, | 831 switches::kChildCleanExit, |
| 831 #endif | 832 #endif |
| 832 switches::kRendererStartupDialog, | 833 switches::kRendererStartupDialog, |
| 833 switches::kShowPaintRects, | 834 switches::kShowPaintRects, |
| 834 switches::kTestSandbox, | 835 switches::kTestSandbox, |
| 835 switches::kTraceStartup, | 836 switches::kTraceStartup, |
| 836 // This flag needs to be propagated to the renderer process for | 837 // This flag needs to be propagated to the renderer process for |
| 837 // --in-process-webgl. | 838 // --in-process-webgl. |
| 838 switches::kUseGL, | 839 switches::kUseGL, |
| 839 switches::kUserAgent, | 840 switches::kUserAgent, |
| 840 switches::kV, | 841 switches::kV, |
| 841 switches::kVideoThreads, | 842 switches::kVideoThreads, |
| 842 switches::kVModule, | 843 switches::kVModule, |
| 843 switches::kWebCoreLogChannels, | 844 switches::kWebCoreLogChannels, |
| 844 }; | 845 }; |
| 845 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 846 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, |
| 846 arraysize(kSwitchNames)); | 847 arraysize(kSwitchNames)); |
| 847 | 848 |
| 848 // Disable databases in incognito mode. | 849 // Disable databases in incognito mode. |
| 849 if (GetBrowserContext()->IsOffTheRecord() && | 850 if (GetBrowserContext()->IsOffTheRecord() && |
| 850 !browser_cmd.HasSwitch(switches::kDisableDatabases)) { | 851 !browser_cmd.HasSwitch(switches::kDisableDatabases)) { |
| 851 renderer_cmd->AppendSwitch(switches::kDisableDatabases); | 852 renderer_cmd->AppendSwitch(switches::kDisableDatabases); |
| 853 #if defined(OS_ANDROID) |
| 854 renderer_cmd->AppendSwitch(switches::kDisableMediaHistoryLogging); |
| 855 #endif |
| 852 } | 856 } |
| 853 } | 857 } |
| 854 | 858 |
| 855 base::ProcessHandle RenderProcessHostImpl::GetHandle() { | 859 base::ProcessHandle RenderProcessHostImpl::GetHandle() { |
| 856 if (run_renderer_in_process()) | 860 if (run_renderer_in_process()) |
| 857 return base::Process::Current().handle(); | 861 return base::Process::Current().handle(); |
| 858 | 862 |
| 859 if (!child_process_launcher_.get() || child_process_launcher_->IsStarting()) | 863 if (!child_process_launcher_.get() || child_process_launcher_->IsStarting()) |
| 860 return base::kNullProcessHandle; | 864 return base::kNullProcessHandle; |
| 861 | 865 |
| (...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1547 const gfx::Size& size, | 1551 const gfx::Size& size, |
| 1548 int32 gpu_process_host_id) { | 1552 int32 gpu_process_host_id) { |
| 1549 TRACE_EVENT0("renderer_host", | 1553 TRACE_EVENT0("renderer_host", |
| 1550 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); | 1554 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); |
| 1551 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, | 1555 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, |
| 1552 gpu_process_host_id, | 1556 gpu_process_host_id, |
| 1553 0); | 1557 0); |
| 1554 } | 1558 } |
| 1555 | 1559 |
| 1556 } // namespace content | 1560 } // namespace content |
| OLD | NEW |