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 #include "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 GpuProcessHost::gpu_enabled() && | 508 GpuProcessHost::gpu_enabled() && |
509 command_line.HasSwitch(switches::kEnableAcceleratedPainting); | 509 command_line.HasSwitch(switches::kEnableAcceleratedPainting); |
510 prefs.accelerated_filters_enabled = | 510 prefs.accelerated_filters_enabled = |
511 GpuProcessHost::gpu_enabled() && | 511 GpuProcessHost::gpu_enabled() && |
512 command_line.HasSwitch(switches::kEnableAcceleratedFilters); | 512 command_line.HasSwitch(switches::kEnableAcceleratedFilters); |
513 prefs.accelerated_layers_enabled = | 513 prefs.accelerated_layers_enabled = |
514 prefs.accelerated_animation_enabled = | 514 prefs.accelerated_animation_enabled = |
515 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); | 515 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); |
516 prefs.accelerated_plugins_enabled = | 516 prefs.accelerated_plugins_enabled = |
517 !command_line.HasSwitch(switches::kDisableAcceleratedPlugins); | 517 !command_line.HasSwitch(switches::kDisableAcceleratedPlugins); |
| 518 // Temporarily disabling H/W accelerated video on windows to see if it is the |
| 519 // cause of the spike in the gpu process crashes. |
| 520 #if defined(OS_WIN) |
| 521 prefs.accelerated_video_enabled = false; |
| 522 #else // OS_WIN |
518 prefs.accelerated_video_enabled = | 523 prefs.accelerated_video_enabled = |
519 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); | 524 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); |
| 525 #endif // OS_WIN |
520 prefs.fullscreen_enabled = | 526 prefs.fullscreen_enabled = |
521 !command_line.HasSwitch(switches::kDisableFullScreen); | 527 !command_line.HasSwitch(switches::kDisableFullScreen); |
522 prefs.css_regions_enabled = | 528 prefs.css_regions_enabled = |
523 command_line.HasSwitch(switches::kEnableCssRegions); | 529 command_line.HasSwitch(switches::kEnableCssRegions); |
524 prefs.css_shaders_enabled = | 530 prefs.css_shaders_enabled = |
525 command_line.HasSwitch(switches::kEnableCssShaders); | 531 command_line.HasSwitch(switches::kEnableCssShaders); |
526 prefs.css_variables_enabled = | 532 prefs.css_variables_enabled = |
527 command_line.HasSwitch(switches::kEnableCssVariables); | 533 command_line.HasSwitch(switches::kEnableCssVariables); |
528 prefs.device_supports_touch = | 534 prefs.device_supports_touch = |
529 ui::GetDisplayLayout() == ui::LAYOUT_TOUCH; | 535 ui::GetDisplayLayout() == ui::LAYOUT_TOUCH; |
(...skipping 2624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3154 old_browser_plugin_host()->embedder_render_process_host(); | 3160 old_browser_plugin_host()->embedder_render_process_host(); |
3155 *embedder_container_id = old_browser_plugin_host()->instance_id(); | 3161 *embedder_container_id = old_browser_plugin_host()->instance_id(); |
3156 int embedder_process_id = | 3162 int embedder_process_id = |
3157 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; | 3163 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; |
3158 if (embedder_process_id != -1) { | 3164 if (embedder_process_id != -1) { |
3159 *embedder_channel_name = | 3165 *embedder_channel_name = |
3160 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), | 3166 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), |
3161 embedder_process_id); | 3167 embedder_process_id); |
3162 } | 3168 } |
3163 } | 3169 } |
OLD | NEW |