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

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

Issue 11821029: Temporarily roll out "Add a switch to enable composited scrolling for frames..." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 prefs.show_composited_layer_borders = 477 prefs.show_composited_layer_borders =
478 command_line.HasSwitch(switches::kShowCompositedLayerBorders); 478 command_line.HasSwitch(switches::kShowCompositedLayerBorders);
479 prefs.show_composited_layer_tree = 479 prefs.show_composited_layer_tree =
480 command_line.HasSwitch(switches::kShowCompositedLayerTree); 480 command_line.HasSwitch(switches::kShowCompositedLayerTree);
481 prefs.show_fps_counter = 481 prefs.show_fps_counter =
482 command_line.HasSwitch(switches::kShowFPSCounter); 482 command_line.HasSwitch(switches::kShowFPSCounter);
483 prefs.accelerated_compositing_for_overflow_scroll_enabled = 483 prefs.accelerated_compositing_for_overflow_scroll_enabled =
484 command_line.HasSwitch(switches::kEnableAcceleratedOverflowScroll); 484 command_line.HasSwitch(switches::kEnableAcceleratedOverflowScroll);
485 prefs.accelerated_compositing_for_scrollable_frames_enabled = 485 prefs.accelerated_compositing_for_scrollable_frames_enabled =
486 command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames); 486 command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames);
487 prefs.composited_scrolling_for_frames_enabled =
488 command_line.HasSwitch(switches::kEnableCompositedScrollingForFrames);
489 prefs.show_paint_rects = 487 prefs.show_paint_rects =
490 command_line.HasSwitch(switches::kShowPaintRects); 488 command_line.HasSwitch(switches::kShowPaintRects);
491 prefs.render_vsync_enabled = 489 prefs.render_vsync_enabled =
492 !command_line.HasSwitch(switches::kDisableGpuVsync); 490 !command_line.HasSwitch(switches::kDisableGpuVsync);
493 prefs.accelerated_compositing_enabled = 491 prefs.accelerated_compositing_enabled =
494 GpuProcessHost::gpu_enabled() && 492 GpuProcessHost::gpu_enabled() &&
495 !command_line.HasSwitch(switches::kDisableAcceleratedCompositing); 493 !command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
496 prefs.force_compositing_mode = 494 prefs.force_compositing_mode =
497 command_line.HasSwitch(switches::kForceCompositingMode) && 495 command_line.HasSwitch(switches::kForceCompositingMode) &&
498 !command_line.HasSwitch(switches::kDisableForceCompositingMode); 496 !command_line.HasSwitch(switches::kDisableForceCompositingMode);
(...skipping 2889 matching lines...) Expand 10 before | Expand all | Expand 10 after
3388 3386
3389 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3387 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3390 return browser_plugin_guest_.get(); 3388 return browser_plugin_guest_.get();
3391 } 3389 }
3392 3390
3393 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3391 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3394 return browser_plugin_embedder_.get(); 3392 return browser_plugin_embedder_.get();
3395 } 3393 }
3396 3394
3397 } // namespace content 3395 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_startup_flags.cc ('k') | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698