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 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
814 std::string field_trial_states; | 814 std::string field_trial_states; |
815 base::FieldTrialList::StatesToString(&field_trial_states); | 815 base::FieldTrialList::StatesToString(&field_trial_states); |
816 if (!field_trial_states.empty()) { | 816 if (!field_trial_states.empty()) { |
817 command_line->AppendSwitchASCII(switches::kForceFieldTrials, | 817 command_line->AppendSwitchASCII(switches::kForceFieldTrials, |
818 field_trial_states); | 818 field_trial_states); |
819 } | 819 } |
820 | 820 |
821 if (content::IsThreadedCompositingEnabled()) | 821 if (content::IsThreadedCompositingEnabled()) |
822 command_line->AppendSwitch(switches::kEnableThreadedCompositing); | 822 command_line->AppendSwitch(switches::kEnableThreadedCompositing); |
823 | 823 |
| 824 if (content::IsDelegatedRendererEnabled()) |
| 825 command_line->AppendSwitch(switches::kEnableDelegatedRenderer); |
| 826 |
824 GetContentClient()->browser()->AppendExtraCommandLineSwitches( | 827 GetContentClient()->browser()->AppendExtraCommandLineSwitches( |
825 command_line, GetID()); | 828 command_line, GetID()); |
826 | 829 |
827 // Appending disable-gpu-feature switches due to software rendering list. | 830 // Appending disable-gpu-feature switches due to software rendering list. |
828 GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance(); | 831 GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance(); |
829 DCHECK(gpu_data_manager); | 832 DCHECK(gpu_data_manager); |
830 gpu_data_manager->AppendRendererCommandLine(command_line); | 833 gpu_data_manager->AppendRendererCommandLine(command_line); |
831 } | 834 } |
832 | 835 |
833 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( | 836 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1770 // Skip widgets in other processes. | 1773 // Skip widgets in other processes. |
1771 if (widgets[i]->GetProcess()->GetID() != GetID()) | 1774 if (widgets[i]->GetProcess()->GetID() != GetID()) |
1772 continue; | 1775 continue; |
1773 | 1776 |
1774 RenderViewHost* rvh = RenderViewHost::From(widgets[i]); | 1777 RenderViewHost* rvh = RenderViewHost::From(widgets[i]); |
1775 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); | 1778 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); |
1776 } | 1779 } |
1777 } | 1780 } |
1778 | 1781 |
1779 } // namespace content | 1782 } // namespace content |
OLD | NEW |