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

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

Issue 11878026: Merge 175917 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/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
« no previous file with comments | « content/browser/android/content_startup_flags.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 prefs.show_composited_layer_borders = 474 prefs.show_composited_layer_borders =
475 command_line.HasSwitch(switches::kShowCompositedLayerBorders); 475 command_line.HasSwitch(switches::kShowCompositedLayerBorders);
476 prefs.show_composited_layer_tree = 476 prefs.show_composited_layer_tree =
477 command_line.HasSwitch(switches::kShowCompositedLayerTree); 477 command_line.HasSwitch(switches::kShowCompositedLayerTree);
478 prefs.show_fps_counter = 478 prefs.show_fps_counter =
479 command_line.HasSwitch(switches::kShowFPSCounter); 479 command_line.HasSwitch(switches::kShowFPSCounter);
480 prefs.accelerated_compositing_for_overflow_scroll_enabled = 480 prefs.accelerated_compositing_for_overflow_scroll_enabled =
481 command_line.HasSwitch(switches::kEnableAcceleratedOverflowScroll); 481 command_line.HasSwitch(switches::kEnableAcceleratedOverflowScroll);
482 prefs.accelerated_compositing_for_scrollable_frames_enabled = 482 prefs.accelerated_compositing_for_scrollable_frames_enabled =
483 command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames); 483 command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames);
484 prefs.composited_scrolling_for_frames_enabled =
485 command_line.HasSwitch(switches::kEnableCompositedScrollingForFrames);
484 prefs.show_paint_rects = 486 prefs.show_paint_rects =
485 command_line.HasSwitch(switches::kShowPaintRects); 487 command_line.HasSwitch(switches::kShowPaintRects);
486 prefs.render_vsync_enabled = 488 prefs.render_vsync_enabled =
487 !command_line.HasSwitch(switches::kDisableGpuVsync); 489 !command_line.HasSwitch(switches::kDisableGpuVsync);
488 prefs.accelerated_compositing_enabled = 490 prefs.accelerated_compositing_enabled =
489 GpuProcessHost::gpu_enabled() && 491 GpuProcessHost::gpu_enabled() &&
490 !command_line.HasSwitch(switches::kDisableAcceleratedCompositing); 492 !command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
491 prefs.force_compositing_mode = 493 prefs.force_compositing_mode =
492 command_line.HasSwitch(switches::kForceCompositingMode) && 494 command_line.HasSwitch(switches::kForceCompositingMode) &&
493 !command_line.HasSwitch(switches::kDisableForceCompositingMode); 495 !command_line.HasSwitch(switches::kDisableForceCompositingMode);
(...skipping 2900 matching lines...) Expand 10 before | Expand all | Expand 10 after
3394 3396
3395 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3397 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3396 return browser_plugin_guest_.get(); 3398 return browser_plugin_guest_.get();
3397 } 3399 }
3398 3400
3399 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3401 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3400 return browser_plugin_embedder_.get(); 3402 return browser_plugin_embedder_.get();
3401 } 3403 }
3402 3404
3403 } // namespace content 3405 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_startup_flags.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698