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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10917269: Use a single flag for enabling experimental WebKit features. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 months 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
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 #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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 prefs.accelerated_layers_enabled = 516 prefs.accelerated_layers_enabled =
517 prefs.accelerated_animation_enabled = 517 prefs.accelerated_animation_enabled =
518 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); 518 !command_line.HasSwitch(switches::kDisableAcceleratedLayers);
519 prefs.accelerated_plugins_enabled = 519 prefs.accelerated_plugins_enabled =
520 !command_line.HasSwitch(switches::kDisableAcceleratedPlugins); 520 !command_line.HasSwitch(switches::kDisableAcceleratedPlugins);
521 prefs.accelerated_video_enabled = 521 prefs.accelerated_video_enabled =
522 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); 522 !command_line.HasSwitch(switches::kDisableAcceleratedVideo);
523 prefs.fullscreen_enabled = 523 prefs.fullscreen_enabled =
524 !command_line.HasSwitch(switches::kDisableFullScreen); 524 !command_line.HasSwitch(switches::kDisableFullScreen);
525 prefs.css_regions_enabled = 525 prefs.css_regions_enabled =
526 command_line.HasSwitch(switches::kEnableCssRegions); 526 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
527 prefs.css_shaders_enabled = 527 prefs.css_shaders_enabled =
528 command_line.HasSwitch(switches::kEnableCssShaders); 528 command_line.HasSwitch(switches::kEnableCssShaders);
529 prefs.css_variables_enabled = 529 prefs.css_variables_enabled =
530 command_line.HasSwitch(switches::kEnableCssVariables); 530 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
531 #if defined(USE_AURA) && defined(USE_X11) 531 #if defined(USE_AURA) && defined(USE_X11)
532 prefs.device_supports_touch |= 532 prefs.device_supports_touch |=
533 ui::TouchFactory::GetInstance()->IsTouchDevicePresent(); 533 ui::TouchFactory::GetInstance()->IsTouchDevicePresent();
534 #endif 534 #endif
535 #if defined(OS_WIN) 535 #if defined(OS_WIN)
536 prefs.device_supports_touch = ui::IsTouchDevicePresent(); 536 prefs.device_supports_touch = ui::IsTouchDevicePresent();
537 #endif 537 #endif
538 #if defined(OS_ANDROID) 538 #if defined(OS_ANDROID)
539 prefs.device_supports_mouse = false; 539 prefs.device_supports_mouse = false;
540 #endif 540 #endif
(...skipping 2746 matching lines...) Expand 10 before | Expand all | Expand 10 after
3287 old_browser_plugin_host()->embedder_render_process_host(); 3287 old_browser_plugin_host()->embedder_render_process_host();
3288 *embedder_container_id = old_browser_plugin_host()->instance_id(); 3288 *embedder_container_id = old_browser_plugin_host()->instance_id();
3289 int embedder_process_id = 3289 int embedder_process_id =
3290 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; 3290 embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
3291 if (embedder_process_id != -1) { 3291 if (embedder_process_id != -1) {
3292 *embedder_channel_name = 3292 *embedder_channel_name =
3293 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), 3293 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
3294 embedder_process_id); 3294 embedder_process_id);
3295 } 3295 }
3296 } 3296 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698